Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 10 Feb 2018 18:41:47 +0000 (21:41 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 10 Feb 2018 18:41:47 +0000 (21:41 +0300)
commit531fa1eb217365d964f726f2c818db8db9cd9a7f
tree12d119be6ae96dd49b49b9b07aaa4177e3e42ba4
parentdb05adae17049f8b5255184c755d82f5b4a30fc1
parent38b8816d7bc0d05d21b62c4b859079a438d168c5
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh