projects / monky / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61ad0c2 000acfe)
Merge branch '1.8.0' into 1.8.1
authorBrenden Matthews <brenden@diddyinc.com>
Tue, 26 Jan 2010 21:05:59 +0000 (13:05 -0800)
committerBrenden Matthews <brenden@diddyinc.com>
Tue, 26 Jan 2010 21:05:59 +0000 (13:05 -0800)
Conflicts:
src/conky.c

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.