]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3ee9db 155bb8c)
Merge branch 'master' into Lyberta/d0BuildFix
authorLyberta <lyberta@lyberta.net>
Sun, 30 Apr 2017 17:44:33 +0000 (20:44 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 30 Apr 2017 17:44:33 +0000 (20:44 +0300)

Trivial merge