Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Wed, 5 Oct 2016 09:16:34 +0000 (19:16 +1000)
committerMario <mario@smbclan.net>
Wed, 5 Oct 2016 09:16:34 +0000 (19:16 +1000)
commita3d9634886e52c442bd9d68a86b8df77e6ed26ed
tree23e4905b2fa907408e335389e851c7bd34e72e54
parent910457448f6e80b449739f75f98ce6aa28a47536
parent80869a0c1266387f4ffe026fc31930ff4d5eac83
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/hook.qc