]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 683bfa5 6ce2f4d)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 26 Sep 2011 19:12:07 +0000 (20:12 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 26 Sep 2011 19:12:07 +0000 (20:12 +0100)
1  2 
src/ipc.c patch | diff1 | diff2 | blob | history

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