]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d21027 386477b)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 22:35:13 +0000 (22:35 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 22:35:13 +0000 (22:35 +0000)
1  2 
src/config.c patch | diff1 | diff2 | blob | history

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