Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 20:30:27 +0000 (14:30 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 20:30:27 +0000 (14:30 -0600)
commita3e4b3dd415d95bb3d1f9e2e1dfaca1ae63e74d1
tree5acbba003c7cdc2949c1fa44ef25a3da950e48c1
parent41aed41e358863600c4233c957439bd051e00b1b
parent46df53a3613518fb9c3a2088d333a23457258cbb
Merge branch 'master' of git.omp.am:/home/omp/git/conky
doc/config_settings.xml