projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9827726 db1c006)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Thu, 6 Aug 2009 20:21:50 +0000 (14:21 -0600)
committerBrenden Matthews <brenden@rty.ca>
Thu, 6 Aug 2009 20:21:50 +0000 (14:21 -0600)
Conflicts:
src/conky.h

1  2 
src/conky.c patch | diff1 | diff2 | blob | history
src/conky.h patch | diff1 | diff2 | blob | history

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