]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5dce84 3c1c67e)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 22:25:06 +0000 (22:25 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 22:25:06 +0000 (22:25 +0000)

Trivial merge
A better tiling and dynamic window manager