]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 18 Jan 2012 19:18:22 +0000 (19:18 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 18 Jan 2012 19:18:22 +0000 (19:18 +0000)
commitfd8e1c98c91c86300904ae85dd22657dcb291bf5
tree496b9e973da3f993f36546cf2f5feeaddee20b38
parentf32cc6f4ae3f92c63d2f738b69d84269be8549ab
parent67ff74d4e3b6997a5ffe65b0ef35020145305d7e
Merge branch 'master' into next

Conflicts:
src/handlers.c
include/data.h
src/handlers.c
src/window.c
src/x.c