projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a074cb9 613df97)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Mon, 16 Mar 2009 20:21:11 +0000 (21:21 +0100)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Mon, 16 Mar 2009 20:21:11 +0000 (21:21 +0100)

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