Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 09:45:33 +0000 (11:45 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 09:45:33 +0000 (11:45 +0200)
commitdf17a5430126247124d150cfab1cc417fa9c62b8
tree54d4e810309caee8a4234747b4af18dfa080447b
parent4211ac30db847eb773ac0ca0f41fe9ca3f15f0ef
parent9e6fb9c2fe3572fa03bd8ca26c175afd28ddb6da
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/conky.c