Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Tue, 29 Aug 2017 00:46:57 +0000 (03:46 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 29 Aug 2017 00:46:57 +0000 (03:46 +0300)
1  2 
defaultClient.cfg
defaultServer.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge