Merge branch 'master' into Lyberta/GivePlayerAmmo
authorLyberta <lyberta@lyberta.net>
Wed, 16 Aug 2017 00:16:25 +0000 (03:16 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 16 Aug 2017 00:16:25 +0000 (03:16 +0300)
commit2183056a5b6e75d2e025aa6c718eeb6f87de31b6
tree74d47733d36124890eb5ee6e0562ee815b86ca62
parentd45e593ef8cfffe645ee76e566e1da938491baf2
parentafb903877a0d219164d80c8b7b09662f84b978a8
Merge branch 'master' into Lyberta/GivePlayerAmmo
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh