]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Tue, 15 Aug 2017 23:11:44 +0000 (02:11 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 15 Aug 2017 23:11:44 +0000 (02:11 +0300)
commitc610d5c70fcaa5963b9d422bbf6e8cfbc6b83ed0
tree91b1438c809dd15859f66ca956511b3b0cc4a9e3
parent14e7cef4146eb374b5767fbef0f5a5f856442680
parentf2dd081d4c214094b741bd0272bcf9fa960320ae
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival