]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 31 Jan 2015 21:42:54 +0000 (22:42 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 31 Jan 2015 21:42:54 +0000 (22:42 +0100)
1  2 
src/load_layout.c
testcases/t/234-layout-restore-output.t

Simple merge