]> 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: c915258 9751ad8)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sun, 11 Feb 2018 03:14:27 +0000 (06:14 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Feb 2018 03:14:27 +0000 (06:14 +0300)

Trivial merge