]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a32d2d5 d426f15)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
1  2 
src/scratchpad.c patch | diff1 | diff2 | blob | history

diff --cc src/scratchpad.c
Simple merge
A better tiling and dynamic window manager