projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 363cf1a e9d92ae)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Fri, 13 Nov 2009 15:36:49 +0000 (16:36 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Fri, 13 Nov 2009 15:36:49 +0000 (16:36 +0100)

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