JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / spectrwm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9debc3f 56fb67f)
Merge branch 'master' of opensource.conformal.com:/git/scrotwm
authorMarco Peereboom <marco@conformal.com>
Tue, 25 Oct 2011 20:20:18 +0000 (15:20 -0500)
committerMarco Peereboom <marco@conformal.com>
Tue, 25 Oct 2011 20:20:18 +0000 (15:20 -0500)
1  2 
scrotwm.c patch | diff1 | diff2 | blob | history

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