]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 5 Oct 2017 23:30:17 +0000 (02:30 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 5 Oct 2017 23:30:17 +0000 (02:30 +0300)
commit5ed99cdb305b83e8c72892017cb87f02e9f7cc57
tree3af154440d08c3991412a2f6039bcdd43ef5fc07
parentd202232d3d4f96910b140478e6d25a2e25a8d079
parent65c2b590ab8a2b8466ce7ba44e7ab17b6ab2c6e2
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival