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)
commit26693a3ac060825ce6c7f170d4e65f7ac2a1fb25
tree94312b2f9931a014af7efd0be73e12e72d787546
parent5b3299f8a6126e0f404aa127418c6fa8ea0a20ab
parent6939600bdd6a345120ac3e6cf98ac93e75a1ba72
Merge branch 'master' into DefaultUser/armormega

# Conflicts:
# mutators.cfg
# qcsrc/common/mutators/mutator/nix/sv_nix.qc
_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