projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84c6daf c53813a)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Sun, 10 May 2009 17:52:32 +0000 (11:52 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sun, 10 May 2009 17:52:32 +0000 (11:52 -0600)

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