]> 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: 9162a5c 278bb75)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 5 Oct 2017 18:54:14 +0000 (21:54 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 5 Oct 2017 18:54:14 +0000 (21:54 +0300)

Trivial merge