projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47b2869 945da94)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 21:01:09 +0000 (15:01 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 21:01:09 +0000 (15:01 -0600)

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