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

diff --cc src/cmdparse.y
Simple merge
diff --cc src/floating.c
Simple merge