]> 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: d06ee1f 08891ac)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 05:38:19 +0000 (08:38 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 05:38:19 +0000 (08:38 +0300)

Trivial merge