]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 16:03:06 +0000 (18:03 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 16:03:06 +0000 (18:03 +0200)
commite7d6cd0f1cd9da938d09088bb384e5783c292abd
tree8e02fd227894ad6f41b43c9d00410444f81f4349
parentaa65b507ad107053a0d11989080dbc94b0f63d17
parent17c0ec19b2564a0a4706d2e225e8e09e4bb8686d
Merge branch 'master' into next
docs/userguide