]> 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: db4bac6 1444ea7)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 23 Sep 2017 06:34:53 +0000 (09:34 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 23 Sep 2017 06:34:53 +0000 (09:34 +0300)

Trivial merge