projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4211ac3 9e6fb9c)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 09:45:33 +0000 (11:45 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sun, 12 Jul 2009 09:45:33 +0000 (11:45 +0200)
1  2 
src/conky.c patch | diff1 | diff2 | blob | history

diff --cc src/conky.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.