]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 12 Aug 2013 07:13:55 +0000 (09:13 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 12 Aug 2013 07:13:55 +0000 (09:13 +0200)
commit3216cc79deb9bfc2258220e7b18f994c7d261474
tree5634a5cee2734f15529d0b7776e1445aed26d530
parentcc36c94b6039e2160a901c2c4f4d5b7bda648746
parent2fe2e005a09df96fa2d2e4b3ac2c5535996a7243
Merge branch 'master' into next
docs/userguide