Merge branch 'master' of git://nwl.cc/~n0-1/conky
authorBrenden Matthews <brenden@rty.ca>
Thu, 18 Dec 2008 00:03:33 +0000 (17:03 -0700)
committerBrenden Matthews <brenden@rty.ca>
Thu, 18 Dec 2008 00:03:33 +0000 (17:03 -0700)
commit35a2d09c5f5cac63fc8025c1c7a4ddb1babfb8cb
treedb726dabc81f07116de98293963d9b8f9cdf1007
parent479a06508fe9cf40d7b95baa6b44b6a98a58b437
parentf85c1ea5a6e935bd66942955e793479bf4381c0a
Merge branch 'master' of git://nwl.cc/~n0-1/conky
ChangeLog
src/linux.c