]> 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: 0a58cfa 7036e28)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 28 Mar 2017 08:53:53 +0000 (11:53 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 28 Mar 2017 08:53:53 +0000 (11:53 +0300)

Trivial merge