]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 29 Aug 2011 14:05:11 +0000 (16:05 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 29 Aug 2011 14:05:11 +0000 (16:05 +0200)
commitc3d0957efd46eaf86e711215f1ca8743157ab2da
treeddc07e7ce7bd311ec9a8db59a18e2d4077f0fc6f
parent1a34d250bb5551d641e9fb762ec323506034bfce
parent69dc632a4ef93872a9e45ef1761f69a20a82e58b
Merge branch 'master' into next
docs/userguide