Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Thu, 6 Aug 2009 20:21:50 +0000 (14:21 -0600)
committerBrenden Matthews <brenden@rty.ca>
Thu, 6 Aug 2009 20:21:50 +0000 (14:21 -0600)
commitd710ea8b9d134c1b61510c400f99006f5b07c10c
treea153c9d0216a5b2827df2fdac286eec06fb01810
parent9827726ae5a13a49a9bcb3528db9a251e0e99530
parentdb1c0061b02e9907c2c302d01499a33931fb0eb6
Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
src/conky.h
src/conky.c
src/conky.h