]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 12:03:14 +0000 (15:03 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 12:03:14 +0000 (15:03 +0300)
commitcc77b45073dfdaa54be3d60e6e5a79307a1c76e7
treeeea3fe736499b66b415c0052850c94442b3991d7
parenta8274babe2542efc81cbc7d7f0fcc7e4c02f0cb1
parent825e258bbbb853e94f2c15542526b033cc580b13
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival