]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 10:47:59 +0000 (11:47 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 10:47:59 +0000 (11:47 +0100)
1  2 
src/handlers.c

diff --cc src/handlers.c
Simple merge