]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de7c284 67aab7c)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 20 Sep 2011 21:37:08 +0000 (22:37 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 20 Sep 2011 21:37:08 +0000 (22:37 +0100)
1  2 
src/cfgparse.y patch | diff1 | diff2 | blob | history

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