projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 580fa3a 51c928a)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Wed, 29 Jul 2009 16:04:57 +0000 (18:04 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Wed, 29 Jul 2009 16:04:57 +0000 (18:04 +0200)

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