]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 14:37:09 +0000 (16:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 14:37:09 +0000 (16:37 +0200)
commit22e30061f366400727bd746636be990db7cad89b
tree8c157952391815ba96c8b0038c5b85963b7792c4
parent1779719b809cb2d37c41a56d008f0fce00f2aa14
parent0f077f1dbfedeb52be0d7ea81f9cd31b2d99896c
Merge branch 'master' into next
src/manage.c