]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 22 Aug 2012 14:02:02 +0000 (16:02 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 22 Aug 2012 14:02:02 +0000 (16:02 +0200)
1  2 
src/commands.c
testcases/t/141-resize.t

diff --cc src/commands.c
Simple merge
Simple merge