Merge branch 'master' into DefaultUser/kick_teamkiller
authorMario <mario@smbclan.net>
Sat, 25 Nov 2017 01:29:58 +0000 (11:29 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Nov 2017 01:29:58 +0000 (11:29 +1000)
commitd6bf8f685fd35f882e456bdbadc37617ac6bd53a
tree324cdc5e79654cc2167bdb60fc5e2bcfb54b8b34
parent873f6c72c7264b74c01700fe537001dd509d99f2
parenta8b4ee97c89d9c2604d9dafd6bde514089c84450
Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
# mutators.cfg
mutators.cfg
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/common/notifications/all.inc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/scores.qc