]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 17:25:15 +0000 (17:25 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 17:25:15 +0000 (17:25 +0000)
1  2 
src/handlers.c

diff --cc src/handlers.c
Simple merge