]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 16:51:02 +0000 (18:51 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 16:51:02 +0000 (18:51 +0200)
1  2 
i3bar/src/child.c

Simple merge