]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 22 Sep 2011 19:11:44 +0000 (20:11 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 22 Sep 2011 19:11:44 +0000 (20:11 +0100)
commit1717b88174d26ed946bea0a0038a8a999fc2387f
treeb5241e3d3da7f273b074e6afdf2870c4db183934
parent143663f0317d4a5c527976aac59ada2b0f7d7cd6
parentef0f4e7299e646ed540b8705c5a5991093bbacbc
Merge branch 'master' into next
src/cmdparse.y
src/floating.c
src/handlers.c
src/randr.c
src/tree.c
src/workspace.c