]> 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: 9fd5d86 a1372ce)
Merge branch 'master' into Lyberta/DynamicHandicap
authorLyberta <lyberta@lyberta.net>
Wed, 6 Sep 2017 11:44:09 +0000 (14:44 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Sep 2017 11:44:09 +0000 (14:44 +0300)

Trivial merge