Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
commit52df1d2bf2644c84de40b07ba417dbec20fc9035
tree29e6a8e510db85d8a5fd84af8aa704ed488755b5
parent52629bef61a62005e7e2380e7c93d760cc646c8f
parent8922603b9196f3648f11fdbe386d1bcf0675cabf
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
src/conky.c
src/core.c