]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2acbf4d 1d6e41e)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 22:24:12 +0000 (00:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 22:24:12 +0000 (00:24 +0200)

Trivial merge
A better tiling and dynamic window manager