]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 20 Dec 2011 18:44:26 +0000 (18:44 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 20 Dec 2011 18:44:26 +0000 (18:44 +0000)
1  2 
testcases/t/136-floating-ws-empty.t

Simple merge