]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 11 Dec 2012 23:18:23 +0000 (00:18 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 11 Dec 2012 23:18:23 +0000 (00:18 +0100)
1  2 
src/workspace.c

diff --cc src/workspace.c
Simple merge