]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa83b46 9798e5c)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 11:50:22 +0000 (11:50 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 11:50:22 +0000 (11:50 +0000)
Conflicts:
src/handlers.c

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

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