]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28afc8 1ad6eea)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 19:30:36 +0000 (21:30 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 19:30:36 +0000 (21:30 +0200)
1  2 
docs/userguide patch | diff1 | diff2 | blob | history

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