Merge branch 'master' into imlib2
authorBrenden Matthews <brenden@rty.ca>
Sat, 2 May 2009 05:29:21 +0000 (23:29 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sat, 2 May 2009 05:29:21 +0000 (23:29 -0600)
commita98a927116d69f9e2cf50364a0a7acfbe3b4daad
tree4c9fa22c376b44c50047eb9e597bb5aefb92dc66
parent5378d13cfbedf5deb73d27bb550e398dd294bbee
parent27fff0d9cbe067fc08e3690655e8d2e80dd83be4
Merge branch 'master' into imlib2

Conflicts:
configure.ac.in
src/conky.c
configure.ac.in
src/conky.c
src/x11.c