]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Jan 2012 18:21:12 +0000 (18:21 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Jan 2012 18:21:12 +0000 (18:21 +0000)
commit634512404940fb4b1effc930feb8b108883cef60
tree5c6eca0915d390909f0683b65116a4d848455b0f
parent0e1b1dd984bbf96907fc97acdf84b84897a94be0
parent313a700e861e4c388f7c3af7c31021924dbf4857
Merge branch 'master' into next

Conflicts:
src/con.c
src/con.c
testcases/t/156-fullscreen-focus.t