Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorJoe Myre <joe@THEM.(none)>
Sun, 24 May 2009 19:24:07 +0000 (14:24 -0500)
committerJoe Myre <joe@THEM.(none)>
Sun, 24 May 2009 19:24:07 +0000 (14:24 -0500)
commit7b7d038035834ca66530eb0795a63a4c797c8caf
tree8fc90875edcd687f94fb86bf3c94f53631d7ac83
parent9c331dce494881b54db75e1e93a4ce6414a61f20
parent06044bf7e544a113ec02b7c8f5eb53a06d27bcc6
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/conky.c