Merge branch 'master' into imlib2
authorBrenden Matthews <brenden@rty.ca>
Tue, 5 May 2009 23:36:38 +0000 (17:36 -0600)
committerBrenden Matthews <brenden@rty.ca>
Tue, 5 May 2009 23:36:38 +0000 (17:36 -0600)
commit8fbb3a9cfe37ed9530a274e4dca4e09b12a0b33d
treef8efa34edbd558bcff787f73283d24a2dad099c4
parentd6e5a6491f7a08458e4ea927e8caa93386f6e7f4
parentfde096c4359180349d28bf7a87cae362001d35cd
Merge branch 'master' into imlib2
configure.ac.in
src/conky.c