]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 15 Jul 2014 08:28:51 +0000 (10:28 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 15 Jul 2014 08:28:51 +0000 (10:28 +0200)
1  2 
src/commands.c
src/load_layout.c

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