]> 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: 2d09d84 ada6591)
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 4 Jun 2017 18:46:18 +0000 (21:46 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 4 Jun 2017 18:46:18 +0000 (21:46 +0300)

Trivial merge