]> 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: 09c6d0f 60f27ea)
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 17 Jun 2017 13:06:42 +0000 (16:06 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Jun 2017 13:06:42 +0000 (16:06 +0300)

Trivial merge