Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:55:11 +0000 (18:55 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:55:11 +0000 (18:55 +0300)
commit723fe3aa08556fdde679753c0afde734853f34e5
tree816c2707c81efdbdd7e89544450d18d472751243
parent2b58aea4138b82cd34f025835393a47f0619e56f
parent65493c17d47c0d5ece5e28a999a0162c5b070acb
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