Merge with conky1-extra, Changelog contains the changes
authorNikolas Garofil <ngarofil@users.sourceforge.net>
Sat, 21 Jun 2008 20:37:58 +0000 (20:37 +0000)
committerNikolas Garofil <ngarofil@users.sourceforge.net>
Sat, 21 Jun 2008 20:37:58 +0000 (20:37 +0000)
commit312d3d6de85cb9e3dea42f9ffe86a7e18615b449
tree4849d49057daecf1771b30d100face56674f539f
parent25ef59dc09c4dfc9d7e4d5954fcb2827ce426341
Merge ... conky1-extra, Changelog contains the changes

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
17 files changed:
ChangeLog
README
data/conky.conf
doc/config_settings.xml
doc/conky.1
doc/conky.conf
doc/variables.xml
extras/nano/conky.nanorc
extras/vim/syntax/conkyrc.vim
src/common.c
src/conky.c
src/conky.h
src/freebsd.c
src/linux.c
src/netbsd.c
src/openbsd.c
src/x11.c