]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 12:55:17 +0000 (14:55 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 12:55:17 +0000 (14:55 +0200)
commitf269d8523228fb98cb5bbbfd3ed8997a8c223eff
tree274a2a3f007d0e9c6d53070fa1293dcaec7dd140
parent61cbf7a65896406a15065a85579fc6ed63a33b5f
parent3380f76310ea2f8b0e623f8fae99ad9f973598c8
Merge branch 'master' into next
docs/userguide