]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f4456a 7be5ece)
Merge branch 'fix-scratchpad-reconf'
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)

Trivial merge
A better tiling and dynamic window manager