]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fdb2c0 fdc4413)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 10:37:04 +0000 (12:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 10:37:04 +0000 (12:37 +0200)
1  2 
src/cfgparse.y patch | diff1 | diff2 | blob | history

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