]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:14:17 +0000 (12:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:14:17 +0000 (12:14 +0200)
commit7a22bd1cf3b8cdc3694084f311c405997103d391
tree4ddc27c1ae200aed1ad6a82bf37a573917f31177
parent2abe23d6ff8179b0d047a0bcdeff9c6b75bd89da
parent336ce56cf36ee5ddc4358fac9bb7bedb92b659eb
Merge branch 'master' into next
src/workspace.c