]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72e74a9 65493c1)
Merge branch 'master' into Lyberta/TeamplayFixes2 507/head
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:51:57 +0000 (18:51 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:51:57 +0000 (18:51 +0300)

Trivial merge