projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94cd289 b963c28)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sun, 26 Jul 2009 11:04:11 +0000 (13:04 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sun, 26 Jul 2009 11:04:11 +0000 (13:04 +0200)

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