projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 650be03 3344473)
Merge branch 'master' of git://nwl.cc/~n0-1/conky
authorBrenden Matthews <brenden@rty.ca>
Mon, 15 Dec 2008 05:42:20 +0000 (22:42 -0700)
committerBrenden Matthews <brenden@rty.ca>
Mon, 15 Dec 2008 05:42:20 +0000 (22:42 -0700)
Conflicts:
configure.ac.in


Trivial merge
Unnamed repository; edit this file to name it for gitweb.