]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)
1  2 
src/con.c

diff --cc src/con.c
Simple merge