]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df2236c 9cb2437)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 21:24:05 +0000 (21:24 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 21:24:05 +0000 (21:24 +0000)
1  2 
src/cfgparse.y patch | diff1 | diff2 | blob | history

diff --cc src/cfgparse.y
Simple merge
A better tiling and dynamic window manager