]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19a11d3 06f78be)
Merge branch 'master' into Lyberta/d0BuildFix
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 06:39:39 +0000 (09:39 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 06:39:39 +0000 (09:39 +0300)

Trivial merge