Merge branch 'master' of git://nwl.cc/~n0-1/conky
authorBrenden Matthews <brenden@rty.ca>
Tue, 16 Dec 2008 01:00:05 +0000 (18:00 -0700)
committerBrenden Matthews <brenden@rty.ca>
Tue, 16 Dec 2008 01:00:05 +0000 (18:00 -0700)
commit2b128b7a7c0ae45a8cd7d88e593e79f6a7175e3f
tree5ed5a121829a8d9f712f91a822fa4ed99bd9fdd1
parent60fc99ef7136eaa58d3e664c295fab92ee9394be
parent9a85812e06f8a278d36b988765c102eaf1c60f88
Merge branch 'master' of git://nwl.cc/~n0-1/conky
ChangeLog
src/linux.c