projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9cb095
85deafa
)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
author
Cesare Tirabassi
<norsetto@ubuntu.com>
Sat, 18 Jul 2009 04:42:25 +0000
(06:42 +0200)
committer
Cesare Tirabassi
<norsetto@ubuntu.com>
Sat, 18 Jul 2009 04:42:25 +0000
(06:42 +0200)
Trivial merge