]> 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 13:10:23 +0000 (16:10 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:23 +0000 (16:10 +0300)
commit88e05e4b19e3d43d41fa740076a4f02ed781dee6
tree1aff6c2f037a00072a68317627950477af87eba1
parentcc77b45073dfdaa54be3d60e6e5a79307a1c76e7
parent9bf3260f89b074f1e984f5ecbeffecfa85bbc18c
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
qcsrc/common/t_items.qc
qcsrc/server/client.qc
qcsrc/server/player.qc