]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 15 Jul 2014 08:28:51 +0000 (10:28 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 15 Jul 2014 08:28:51 +0000 (10:28 +0200)
commitee7582169944e601b54a24ee30b634a8824b6571
tree07391995f739c9dbe83108a018586480a6daaef9
parent344f6be84a9babf6b7ef06567372fd4caae25f02
parent9463be42b84b2d87b470e0ef5ccf3d24114e791a
Merge branch 'master' into next
src/commands.c
src/load_layout.c