]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 22:37:11 +0000 (22:37 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 22:37:11 +0000 (22:37 +0000)
commit0f9fbcbd259a26969c3503ac1e31b2cf2df351f5
treedda4a9127c79d2dda05c06706a9b17a67e080c52
parenteb7b933e2bc11138a326dd50167f2b263b9b0ce0
parentbd3219ac6813970bd821f1b331809812d460874e
Merge branch 'master' into next
testcases/t/141-resize.t