]> 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: 68db11c 1c1a2f3)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Fri, 24 Mar 2017 08:42:02 +0000 (11:42 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 24 Mar 2017 08:42:02 +0000 (11:42 +0300)

Trivial merge