Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Mon, 5 Feb 2018 17:08:43 +0000 (20:08 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 5 Feb 2018 17:08:43 +0000 (20:08 +0300)
commit820589b53e6802eb4c5ea563bb58d48c4f4aa9e1
treeeef42a46b04db67d84634ceaf2c3ec4298e91c88
parente60056d1fb133210db74ea21ad00106c76a5f4d0
parentf1296f5b79150dee1992cefa19c286851451df2d
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultServer.cfg
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/client.qc