projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41aed41 46df53a)
Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 20:30:27 +0000 (14:30 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sat, 1 Aug 2009 20:30:27 +0000 (14:30 -0600)
1  2 
doc/config_settings.xml patch | diff1 | diff2 | blob | history

diff --cc doc/config_settings.xml
Simple merge
Unnamed repository; edit this file to name it for gitweb.