projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d620ac6 fcc6524)
Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 30 Jan 2010 18:24:19 +0000 (19:24 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 30 Jan 2010 18:24:19 +0000 (19:24 +0100)

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