]> 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: 1a95d1f f950c7d)
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 18 Mar 2018 05:02:12 +0000 (08:02 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 18 Mar 2018 05:02:12 +0000 (08:02 +0300)

Trivial merge