Merge branch 'master' into imlib2
authorBrenden Matthews <brenden@rty.ca>
Sun, 17 May 2009 00:37:11 +0000 (18:37 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sun, 17 May 2009 00:37:11 +0000 (18:37 -0600)
commitd26b946b7b3d7b5d00afe3f5250cbd489addad10
treeb3ef95db1823c22467dd1b25331fddfede890592
parent1b94e22b5cd2efe4bf3591aa3abe3cb5babdc5b3
parent344fa8498d0597c8284d364759b638085bd9d593
Merge branch 'master' into imlib2
configure.ac.in
src/Makefile.am
src/conky.c