Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Wed, 12 Oct 2016 22:53:23 +0000 (08:53 +1000)
committerMario <mario@smbclan.net>
Wed, 12 Oct 2016 22:53:23 +0000 (08:53 +1000)
commit3bbcff2475d1b2efc1314a358bf60c6fba6e4be6
tree0d29afa80db611d5c6f0f83f28d0a94adbe89c4b
parentfccc8baa9f35ff2d7ec7aa4ecab6d348a53a180e
parent7a6a774eae9edb72477fd83a1145f381e2982243
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
mutators.cfg
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/physics/player.qc
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh