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)
1  2 
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge
Simple merge