]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 10 Jul 2014 22:33:13 +0000 (00:33 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 10 Jul 2014 22:33:13 +0000 (00:33 +0200)
1  2 
i3bar/src/child.c

Simple merge