]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: eed4328 7fef51e)
Merge branch 'master' into Lyberta/d0BuildFix
authorLyberta <lyberta@lyberta.net>
Mon, 26 Mar 2018 14:58:17 +0000 (17:58 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 26 Mar 2018 14:58:17 +0000 (17:58 +0300)

Trivial merge