Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Mon, 20 Jul 2009 05:45:55 +0000 (23:45 -0600)
committerBrenden Matthews <brenden@rty.ca>
Mon, 20 Jul 2009 05:45:55 +0000 (23:45 -0600)
commit64394fa7da5235fc2d343d7325b25a47468abecb
treeda9b1b3d30ea4d7ca270a13e91611f7000bf033c
parentc05c157eadc1720713c20a174f1ebad5f8d5d29f
parent09d41cb0b640c7994e287cc182c38b81d642d046
Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
configure.ac.in
configure.ac.in
src/Makefile.am
src/conky.c