Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Mon, 3 Aug 2009 18:41:07 +0000 (12:41 -0600)
committerBrenden Matthews <brenden@rty.ca>
Mon, 3 Aug 2009 18:41:07 +0000 (12:41 -0600)
commit05330f24a3fcb3a989d5ac04adff46576a4eb0e8
tree1c432ec63fe751792c007825d4a571afa8bced41
parent51ddee12ddad1cb3b00d8a29516c10869a8ac9e4
parent2118fc58894e9b0d443a4225eb767cf6cc51ba15
Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
src/conky.c
src/conky.c