]> 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: 006b15b 4c6e246)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 21 Jan 2018 03:06:42 +0000 (06:06 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 21 Jan 2018 03:06:42 +0000 (06:06 +0300)

Trivial merge