]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 11 Feb 2015 20:08:00 +0000 (21:08 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 11 Feb 2015 20:08:00 +0000 (21:08 +0100)
commitdb62b5a4df3d7ee7ac9363e4c430ea0155abba25
tree7d3084a0bd7715bd2eeea9d7b92b4288ef2593ac
parent5cf1a0c43bd6b390309612f8369bf1a41ecd460c
parent797855d98eb6e8d0dc63c77a95bbfa11c012e971
Merge branch 'master' into next
i3bar/src/child.c
i3bar/src/xcb.c