Merge branch 'master' into imlib2
authorBrenden Matthews <brenden@rty.ca>
Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
commit80aaadb48f439a33512efca5b9386ebbb028110e
treedad5c9f1668383589b96a981f401d2c829e5a1c0
parenta45c8c9da44a98b1715fe59cdbd98b0c108cf263
parent24f97c45c601c185dbba3e51de3c2b80a64a745d
Merge branch 'master' into imlib2
configure.ac.in
src/conky.c