]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 13 Jan 2014 22:35:22 +0000 (23:35 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 13 Jan 2014 22:35:22 +0000 (23:35 +0100)
1  2 
i3bar/src/child.c

Simple merge