]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d8e3f5 2d0b60b)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 17:47:16 +0000 (19:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 17:47:16 +0000 (19:47 +0200)
1  2 
src/x.c patch | diff1 | diff2 | blob | history

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