]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f8d3d3 138197f)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 10 Feb 2012 00:03:18 +0000 (00:03 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 10 Feb 2012 00:03:18 +0000 (00:03 +0000)
Conflicts:
i3-config-wizard/main.c

1  2 
i3-config-wizard/main.c patch | diff1 | diff2 | blob | history

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