]> 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: 1385d80 c7d9d8d)
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 9 Mar 2018 16:06:48 +0000 (19:06 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 9 Mar 2018 16:06:48 +0000 (19:06 +0300)

Trivial merge