]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 2 Jul 2014 17:06:01 +0000 (19:06 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 2 Jul 2014 17:06:23 +0000 (19:06 +0200)
commit5cbe2d63c0bdd4edd2736f32714443d57f1eacb6
tree9f7427ff3261fca823367ac83611e77d8ceb8530
parentbb24db198685e7dd38736eef590539b9cc6b6891
parent04d292375dd15c0d2d933ab0e3f2f9064732c180
Merge branch 'master' into next
i3bar/src/config.c