]> 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: b20f192 e2c792b)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 25 Mar 2017 09:14:30 +0000 (12:14 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 25 Mar 2017 09:14:30 +0000 (12:14 +0300)

Trivial merge