]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2823d3 113a96d)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:10:52 +0000 (18:10 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:10:52 +0000 (18:10 +0000)
1  2 
src/main.c patch | diff1 | diff2 | blob | history

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