]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 4 Sep 2012 18:21:31 +0000 (20:21 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 4 Sep 2012 18:21:31 +0000 (20:21 +0200)
1  2 
src/handlers.c

diff --cc src/handlers.c
Simple merge