]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'defect-1480' of https://github.com/Airblader/i3-original into Airblader...
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Mar 2015 16:19:22 +0000 (17:19 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Mar 2015 16:19:22 +0000 (17:19 +0100)
1  2 
i3bar/src/child.c

Simple merge