]> 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: 25d4b5e 3d03ed2)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 29 Aug 2017 00:24:11 +0000 (03:24 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 29 Aug 2017 00:24:11 +0000 (03:24 +0300)

Trivial merge