]> git.sur5r.net Git - i3/i3/commit
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 9 Nov 2009 21:55:24 +0000 (22:55 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 9 Nov 2009 21:55:24 +0000 (22:55 +0100)
commit50739cdd58184d71c12f9643af3557ce9a3aae8e
tree233a2108ded34d8cbd275faa9f278ebf6a72d9be
parent49311e27f4a0d693aaf5e9abefa13431e1e0451a
parent6655307951a553e61f47d68aa94967578dd5cf58
Merge branch 'next'

Conflicts:
include/data.h
src/config.c
src/handlers.c
src/layout.c
src/config.c