]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49311e2 6655307)
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)
Conflicts:
include/data.h
src/config.c
src/handlers.c
src/layout.c

1  2 
src/config.c patch | diff1 | diff2 | blob | history

diff --cc src/config.c
Simple merge
A better tiling and dynamic window manager