]> 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: 6c27d78 53371b3)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 28 Jul 2017 01:16:05 +0000 (04:16 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 28 Jul 2017 01:16:05 +0000 (04:16 +0300)

Trivial merge