]> 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: b2dccad cb77cd5)
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:29:37 +0000 (02:29 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:29:37 +0000 (02:29 +0300)

Trivial merge