]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 4 Aug 2012 14:10:37 +0000 (16:10 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 4 Aug 2012 14:10:37 +0000 (16:10 +0200)
commitfb4ee17b054afa2f85ad64480353f554e5eae2d3
tree23ec516bed4d83dd232fff33c095a7f8c015ee6a
parent2f22fae119bb119483298f5423ced3f4d6b37d84
parentc5cfe22511a1749b99cbfe92d98ff10f8339dc07
Merge branch 'master' into next
src/commands.c
src/floating.c
src/randr.c