]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4172e43 ea97119)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Mar 2012 20:41:13 +0000 (21:41 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 21 Mar 2012 20:41:13 +0000 (21:41 +0100)
1  2 
src/cfgparse.l patch | diff1 | diff2 | blob | history

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