]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 10 Nov 2012 08:01:24 +0000 (09:01 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 10 Nov 2012 08:01:24 +0000 (09:01 +0100)
1  2 
src/workspace.c
testcases/t/176-workspace-baf.t

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