]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62cde92 e2b97a6)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 17 Jan 2012 23:39:04 +0000 (23:39 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 17 Jan 2012 23:39:04 +0000 (23:39 +0000)
1  2 
src/x.c patch | diff1 | diff2 | blob | history

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