]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 09:31:31 +0000 (12:31 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 09:31:31 +0000 (12:31 +0300)
commit2ec0c68734ebfd3d272f8dbf8a903e3b717a8bf0
tree93d79c6e001b90901e5fb0faebd23c76b2a411c4
parentefbd8c5b547b1cb77dca8afc6e6dc1ada0d4f082
parent7d1479d6f8fc51bb354f21bbdb0a066193a412f4
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival