]> git.sur5r.net Git - i3/i3/commit - src/startup.c
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)
commit4622cde7b785b522b29d66c7d9bdcc9aa1eeb452
tree2c43acdc0f83e380f6d589de656975f34f608217
parentbe6190a516bef5280d189aa728333ce4e6e0b17a
parent2ac3b08cf6ce27f2a56fda6f64da8dfc4b28582c
Merge branch 'master' into next
src/commands.c
testcases/t/141-resize.t