JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / spectrwm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9b0bc3 60d2953)
Merge branch 'master' of ssh://opensource.conformal.com/git/scrotwm
authormarco <marco@conformal.com>
Fri, 18 Nov 2011 01:55:41 +0000 (19:55 -0600)
committermarco <marco@conformal.com>
Fri, 18 Nov 2011 01:55:41 +0000 (19:55 -0600)
1  2 
scrotwm.c patch | diff1 | diff2 | blob | history

diff --cc scrotwm.c
Simple merge
spectrwm; my tweaks