svn merge -rHEAD:918 .
authorPhilip Kovacs <pkovacs@users.sourceforge.net>
Mon, 13 Aug 2007 19:09:33 +0000 (19:09 +0000)
committerPhilip Kovacs <pkovacs@users.sourceforge.net>
Mon, 13 Aug 2007 19:09:33 +0000 (19:09 +0000)
commitf72122bd06b2c5b997db661f44e6b6339426f1cf
tree2c436d3827b3e17d81a566c56c9ff0e19e2b2f74
parent9c447a19df1a5a196bf46049de1007b6eaee960b
svn merge -rHEAD:918 .

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@921 7f574dfc-610e-0410-a909-a81674777703
85 files changed:
conky1/AUTHORS [deleted file]
conky1/COPYING [deleted file]
conky1/ChangeLog [deleted file]
conky1/Conky.kdevelop [deleted file]
conky1/INSTALL [deleted file]
conky1/LICENSE.BSD [deleted file]
conky1/LICENSE.GPL [deleted file]
conky1/Makefile.am [deleted file]
conky1/NEWS [deleted file]
conky1/README [deleted file]
conky1/README.cvs-version [deleted file]
conky1/TODO [deleted file]
conky1/app-admin/conky/conky-1.4.0.ebuild [deleted file]
conky1/app-admin/conky/conky-1.4.1.ebuild [deleted file]
conky1/app-admin/conky/conky-1.4.2.ebuild [deleted file]
conky1/app-admin/conky/conky-1.4.3.ebuild [deleted file]
conky1/app-admin/conky/conky-1.4.4.ebuild [deleted file]
conky1/app-admin/conky/conky-1.4.5.ebuild [deleted file]
conky1/app-admin/conky/conky-1.4.6.ebuild [deleted file]
conky1/app-admin/conky/conky-1.999.ebuild [deleted file]
conky1/autogen.sh [deleted file]
conky1/buildubu.sh [deleted file]
conky1/changelog2html.py [deleted file]
conky1/config.rpath [deleted file]
conky1/configure.ac.in [deleted file]
conky1/debian/changelog [deleted file]
conky1/debian/compat [deleted file]
conky1/debian/control [deleted file]
conky1/debian/copyright [deleted file]
conky1/debian/docs [deleted file]
conky1/debian/menu [deleted file]
conky1/debian/rules [deleted file]
conky1/doc/Makefile.am [deleted file]
conky1/doc/README.docs [deleted file]
conky1/doc/command_options.xml [deleted file]
conky1/doc/config_settings.xml [deleted file]
conky1/doc/config_settings.xsl [deleted file]
conky1/doc/conky-howto.xml [deleted file]
conky1/doc/conky.1 [deleted file]
conky1/doc/conkyrc.sample [deleted file]
conky1/doc/docgen.sh [deleted file]
conky1/doc/docs.xml [deleted file]
conky1/doc/variables.xml [deleted file]
conky1/doc/variables.xsl [deleted file]
conky1/extras/nano/README [deleted file]
conky1/extras/nano/conky.nanorc [deleted file]
conky1/extras/vim/README [deleted file]
conky1/extras/vim/ftdetect/conkyrc.vim [deleted file]
conky1/extras/vim/syntax/conkyrc.vim [deleted file]
conky1/src/Makefile.am [deleted file]
conky1/src/audacious.c [deleted file]
conky1/src/audacious.h [deleted file]
conky1/src/bmpx.c [deleted file]
conky1/src/build.h.in [deleted file]
conky1/src/common.c [deleted file]
conky1/src/conky.c [deleted file]
conky1/src/conky.h [deleted file]
conky1/src/freebsd.c [deleted file]
conky1/src/fs.c [deleted file]
conky1/src/hddtemp.c [deleted file]
conky1/src/libmpdclient.c [deleted file]
conky1/src/libmpdclient.h [deleted file]
conky1/src/libtcp-portmon.c [deleted file]
conky1/src/libtcp-portmon.h [deleted file]
conky1/src/linux.c [deleted file]
conky1/src/mail.c [deleted file]
conky1/src/mboxscan.c [deleted file]
conky1/src/mboxscan.h [deleted file]
conky1/src/mixer.c [deleted file]
conky1/src/mpd.c [deleted file]
conky1/src/netbsd.c [deleted file]
conky1/src/openbsd.c [deleted file]
conky1/src/prss.c [deleted file]
conky1/src/prss.h [deleted file]
conky1/src/rss.c [deleted file]
conky1/src/solaris.c [deleted file]
conky1/src/timed_thread.c [deleted file]
conky1/src/timed_thread.h [deleted file]
conky1/src/top.c [deleted file]
conky1/src/top.h [deleted file]
conky1/src/x11.c [deleted file]
conky1/src/xmms2.c [deleted file]
src/conky.c
src/conky.h
src/linux.c