]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79b3ac8 b8cb090)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 31 Aug 2017 13:38:37 +0000 (16:38 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 31 Aug 2017 13:38:37 +0000 (16:38 +0300)

Trivial merge