Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 3 Jan 2017 12:37:45 +0000 (22:37 +1000)
committerMario <mario@smbclan.net>
Tue, 3 Jan 2017 12:37:45 +0000 (22:37 +1000)
commit50d8efb863874f811bdcc118d7e873836902e453
treeef82b0fdc78f711231f4d2320fb1e5fd98aaf809
parentcd76ea221e10e17adeac494ef906b6dd85c97cc0
parentf0a82d2bc29ba96f21d97d1c04956389ef6d7b90
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/t_items.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc