]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d7b134 1504289)
Merge branch 'master' into Lyberta/d0BuildFix
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 09:26:13 +0000 (12:26 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 09:26:13 +0000 (12:26 +0300)

Trivial merge