]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82e58e9 e06164f)
Merge branch 'master' into Lyberta/d0BuildFix
authorLyberta <lyberta@lyberta.net>
Sun, 18 Feb 2018 09:08:34 +0000 (12:08 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 18 Feb 2018 09:08:34 +0000 (12:08 +0300)

Trivial merge