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)
1  2 
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh

Simple merge
Simple merge