]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b80dd9 a1c31ac)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 25 Jun 2017 20:40:45 +0000 (23:40 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 25 Jun 2017 20:40:45 +0000 (23:40 +0300)

Trivial merge