]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 24 Jun 2012 15:30:45 +0000 (17:30 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 24 Jun 2012 15:30:45 +0000 (17:30 +0200)
commit23c28e52084f2090140c7c3c85281128f65d48fb
tree4c90b032ed1db1299668557238ec3011fccda7b9
parentd4f8450ea9559024d8643ac23168750744b95ea0
parent421fd9a772a159979da955e4ff1a2515f6c61406
Merge branch 'master' into next
docs/userguide