Merged master into Lyberta/StandaloneOverkillWeapons.
authorLyberta <lyberta@lyberta.net>
Wed, 16 Aug 2017 03:10:50 +0000 (06:10 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 16 Aug 2017 03:10:50 +0000 (06:10 +0300)
commitee5353529c2fee304ac944aa19af53cc85eca7b0
tree9ee6c89e0d26a38c8fcebfa429c744fa53e8f508
parent2e96bd3f374953fcb40468bf47bcb55785e1f8db
parentafb903877a0d219164d80c8b7b09662f84b978a8
Merged master into Lyberta/StandaloneOverkillWeapons.
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh