]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de0ff84 ffcf2bc)
Merge pull request #3170 from stapelberg/master-merge
authorIngo Bürk <admin@airblader.de>
Sat, 10 Mar 2018 20:37:53 +0000 (21:37 +0100)
committerGitHub <noreply@github.com>
Sat, 10 Mar 2018 20:37:53 +0000 (21:37 +0100)
Fix incorrect merge *sigh*


Trivial merge
A better tiling and dynamic window manager