Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 19:18:28 +0000 (21:18 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 19:18:28 +0000 (21:18 +0200)
commitd3f1e6288cdf2b33f80788aa4f37657ce4be922c
tree6a8c42333a92d3151c476978f5c7ce403a213f8e
parent14c30feaeacf3c00e59f0ee92577a5e2ce48f8c1
parent69e27d28b33bec58340b6fc791075b286d925bfc
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/conky.c