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)
1  2 
configure.ac.in
src/conky.c

diff --cc configure.ac.in
Simple merge
diff --cc src/conky.c
Simple merge