Merge branch 'master' into DefaultUser/armormega 387/head
authorMario <mario@smbclan.net>
Sat, 10 Dec 2016 06:09:41 +0000 (16:09 +1000)
committerMario <mario@smbclan.net>
Sat, 10 Dec 2016 06:09:41 +0000 (16:09 +1000)
# Conflicts:
# mutators.cfg
# qcsrc/common/mutators/mutator/nix/sv_nix.qc

1  2 
_hud_common.cfg
mutators.cfg
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/t_items.qc

diff --cc _hud_common.cfg
Simple merge
diff --cc mutators.cfg
Simple merge
Simple merge
Simple merge
Simple merge