]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fe9744 1ddde16)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 7 Feb 2012 22:42:58 +0000 (17:42 -0500)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 7 Feb 2012 22:42:58 +0000 (17:42 -0500)
1  2 
src/tree.c patch | diff1 | diff2 | blob | history
testcases/t/122-split.t patch | diff1 | diff2 | blob | history

diff --cc src/tree.c
Simple merge
diff --cc testcases/t/122-split.t
Simple merge
A better tiling and dynamic window manager