]> 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: 7d8824f d759b94)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 06:50:00 +0000 (09:50 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 06:50:00 +0000 (09:50 +0300)

Trivial merge