Merge branch 'master' into imlib2
authorBrenden Matthews <brenden@rty.ca>
Tue, 12 May 2009 23:52:49 +0000 (17:52 -0600)
committerBrenden Matthews <brenden@rty.ca>
Tue, 12 May 2009 23:52:49 +0000 (17:52 -0600)
commit18b174e967afdb74d85019ff6038daae41dab4ec
tree64ceea5f10feec15266a1fb9085659d4edc4f923
parent80aaadb48f439a33512efca5b9386ebbb028110e
parenta2512e7c4fab0546ec34d9f99d26040187d05c0d
Merge branch 'master' into imlib2

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