]> 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: 3fb7a9d 8368e70)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 3 May 2017 23:15:49 +0000 (02:15 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 3 May 2017 23:15:49 +0000 (02:15 +0300)

Trivial merge