]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6226400 5fb99ad)
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 14:57:41 +0000 (15:57 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 14:57:41 +0000 (15:57 +0100)
Conflicts:
src/commands.c


Trivial merge
A better tiling and dynamic window manager