]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cea6f7a 71d261f)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Dec 2011 15:28:48 +0000 (16:28 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Dec 2011 15:28:48 +0000 (16:28 +0100)

Trivial merge
A better tiling and dynamic window manager