Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Mon, 13 Jul 2009 21:21:42 +0000 (15:21 -0600)
committerBrenden Matthews <brenden@rty.ca>
Mon, 13 Jul 2009 21:21:42 +0000 (15:21 -0600)
commit73194dee89bf31b7bcc5452255a4d22a76263d61
tree5371e468ff4da4d5b929264933a66c3ed5aee983
parent74c19cf8e4749c19eccb01eba3e8630a70111839
parent602edfea15c28f8c7a618cdd47179262568c3d8b
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/conky.c