]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a708da6 da12c9f)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 22:05:15 +0000 (23:05 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 22:05:15 +0000 (23:05 +0100)

Trivial merge
A better tiling and dynamic window manager