]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 13:28:34 +0000 (15:28 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 13:28:34 +0000 (15:28 +0200)
commit057e0e9794c498be97b27cc6f0f9eb9ff6d0a3ee
treec79b76617be4bc7784aa0ed34705e749eae6244b
parent8114ecda478a39c787510bbe6d63f7d19f635da6
parent47ae4d4f6659b4473c29216980e7b5ddb45e9eb9
Merge branch 'master' into next
docs/userguide