]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:09:35 +0000 (16:09 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:09:35 +0000 (16:09 +0300)
commit9bf3260f89b074f1e984f5ecbeffecfa85bbc18c
treee830ae4b7013680eab9eebeab2221f6dced1a7ac
parent825e258bbbb853e94f2c15542526b033cc580b13
parent2243b8d92b2333511af253267a280e2c8f85901f
Merge branch 'master' into Lyberta/PlayerTemplates