]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 622b94f 08986a1)
Merge branch 'scratchpad' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Dec 2011 23:16:47 +0000 (23:16 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Dec 2011 23:16:47 +0000 (23:16 +0000)

Trivial merge
A better tiling and dynamic window manager