]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Mar 2012 21:30:08 +0000 (22:30 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Mar 2012 21:30:08 +0000 (22:30 +0100)
1  2 
src/handlers.c

diff --cc src/handlers.c
Simple merge