]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44548c5 489e9f5)
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 3 May 2017 20:19:08 +0000 (23:19 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 3 May 2017 20:19:08 +0000 (23:19 +0300)

Trivial merge