]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 14:37:09 +0000 (16:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 14:37:09 +0000 (16:37 +0200)
1  2 
src/manage.c

diff --cc src/manage.c
Simple merge