]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 17:16:39 +0000 (17:16 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 17:16:39 +0000 (17:16 +0000)
1  2 
testcases/t/112-floating-resize.t

Simple merge