]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 12:11:51 +0000 (14:11 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 12:11:51 +0000 (14:11 +0200)
commite411223f8ba3b9b53b53e1a9ea4f772fa4f6fda1
tree28c98de1d295ba48830b84102d69ca233be398ec
parent4fcca74e2b2752b2c0fb2ea972374b3f3f70dd7d
parent461e7ef505e8b6c86f20e0d3b10d4063835d7668
Merge branch 'master' into next
docs/userguide