]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22922a9 0929f68)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Sep 2012 11:18:04 +0000 (13:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Sep 2012 11:18:04 +0000 (13:18 +0200)
1  2 
src/con.c patch | diff1 | diff2 | blob | history
src/scratchpad.c patch | diff1 | diff2 | blob | history

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