Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 16:46:07 +0000 (18:46 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 16:46:07 +0000 (18:46 +0200)
commit14c30feaeacf3c00e59f0ee92577a5e2ce48f8c1
treee699173d54aaff12e4967176b8eaed15db100fc9
parente11015528e711c6f43ee761771c35fc545fe2e8f
parentef13d539387bd6a2c7f5f885cc712e6d9afcba91
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/conky.c