]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 27 Jun 2013 22:14:30 +0000 (00:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 27 Jun 2013 22:14:30 +0000 (00:14 +0200)
commit8677936f6ccab4f733580d72926a06a8e1f081a2
tree7728ed79e168bedcc67988867352530411dac395
parentd83b1f7851f406de923f0dc539f28b3b98efbce7
parent32e2180b56a82ed7373e4af8fc5cbf5977f3de5b
Merge branch 'master' into next
i3-nagbar/main.c