]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74a1b06 042b9e3)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:13:53 +0000 (19:13 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:13:53 +0000 (19:13 +0300)

Trivial merge