]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'floating-resize-height'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 22 Aug 2012 14:01:57 +0000 (16:01 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 22 Aug 2012 14:01:57 +0000 (16:01 +0200)

Trivial merge