]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 14:22:29 +0000 (14:22 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 14:22:29 +0000 (14:22 +0000)
commitfc27c19761b47fa449514395f7ea2a21654f515d
tree011fc3f32a1a748e915c0a5434675a4d3ac5903c
parent6ffc0f94cb6a574a8846614c2aab41ea9372a6bb
parentcccf078f1e0ce0d8c91795809293c4c259754073
Merge branch 'master' into next

Conflicts:
testcases/t/005-floating.t
testcases/t/005-floating.t