]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b28457f 16f9c9a)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 22:57:36 +0000 (00:57 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 22:57:36 +0000 (00:57 +0200)
1  2 
src/cmdparse.y patch | diff1 | diff2 | blob | history

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