]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 073cc17 fec3553)
Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 14:37:48 +0000 (17:37 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 14:37:48 +0000 (17:37 +0300)

Trivial merge