projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16c3c2e 6fa3e19)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Tue, 9 Dec 2008 06:15:20 +0000 (23:15 -0700)
committerBrenden Matthews <brenden@rty.ca>
Tue, 9 Dec 2008 06:15:20 +0000 (23:15 -0700)

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