Merge branch 'master' into lua
authorBrenden Matthews <brenden@rty.ca>
Sat, 16 May 2009 23:08:50 +0000 (17:08 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sat, 16 May 2009 23:08:50 +0000 (17:08 -0600)
commitf2a69f37ad0490982b9e3069485bf04c3c50da66
tree9c8be46076fe1abf4f979d88d1b87a689d085403
parentdd606eb5aeea427c751e1eace3e55ec4265eb502
parentdebf4ec597bcc844cec7145afc59e7e8e9fdbc2e
Merge branch 'master' into lua
src/conky.c