]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-resize-in-con'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 13:14:50 +0000 (15:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 13:14:50 +0000 (15:14 +0200)

Trivial merge