projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
14c30fe
69e27d2
)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
author
Cesare Tirabassi
<norsetto@ubuntu.com>
Sun, 12 Jul 2009 19:18:28 +0000
(21:18 +0200)
committer
Cesare Tirabassi
<norsetto@ubuntu.com>
Sun, 12 Jul 2009 19:18:28 +0000
(21:18 +0200)
1
2
src/conky.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/conky.c
Simple merge