]> git.sur5r.net Git - i3/i3/commit
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)
commitcd0cd0c3d22d7acba240ca10d8594621cc67ee34
tree03d7298e458e15b921328cfc15323d6542785230
parent54012719842cdd99286b702dbe72121709a503b8
parent4893f04e0c61bdd4ed101eafa98dd58a496c34b6
Merge branch 'master' into next
i3bar/src/child.c