]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0482dc7 454cc74)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 11:57:27 +0000 (12:57 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 11:57:27 +0000 (12:57 +0100)
1  2 
docs/userguide patch | diff1 | diff2 | blob | history

diff --cc docs/userguide
Simple merge
A better tiling and dynamic window manager