]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:14:26 +0000 (04:14 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:14:26 +0000 (04:14 +0300)
commitbd32d032c96d26419c51388edc713618e46eaa8a
tree055eec2005574536fe8500cb390017da7e77f0f1
parent6e3f46e7666b5d62c78472f466585f43452b6442
parent49dd3844a37bb91e3c48654dead867b15ce94638
Merge branch 'master' into Lyberta/PlayerTemplates