]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 20:43:31 +0000 (22:43 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 20:43:31 +0000 (22:43 +0200)
1  2 
src/floating.c

diff --cc src/floating.c
Simple merge