Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 18 Jul 2009 14:00:49 +0000 (16:00 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 18 Jul 2009 14:00:49 +0000 (16:00 +0200)
commit806b840646465bcb6a6120c2d7abb1a00e6f3897
treec093026b3ee08ac211d3db88e611ce6f6a05d8be
parent46fc4a056495aa6363e51eedfc08c41ae0253a9c
parent4284490080859108015960be6a8bfc5baad6f30f
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/conky.c