]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a32b6da b8bf3d3)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 4 Jan 2014 11:23:06 +0000 (12:23 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 4 Jan 2014 11:23:06 +0000 (12:23 +0100)
1  2 
src/i3.mk patch | diff1 | diff2 | blob | history

diff --cc src/i3.mk
Simple merge
A better tiling and dynamic window manager