]> 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: 77acc84 1a992df)
Merge branch 'master' into Lyberta/DynamicHandicap
authorLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:39:30 +0000 (02:39 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:39:30 +0000 (02:39 +0300)

Trivial merge