]> 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: 97709e9 0aadd05)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 25 May 2017 19:28:30 +0000 (22:28 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 25 May 2017 19:28:30 +0000 (22:28 +0300)

Trivial merge