Merge branch 'master' into Mario/invasion_types
authorMario <mario@smbclan.net>
Sat, 26 Aug 2017 15:19:52 +0000 (01:19 +1000)
committerMario <mario@smbclan.net>
Sat, 26 Aug 2017 15:19:52 +0000 (01:19 +1000)
commitfdbfb6f9364d8aeae67e108400a6bd1dd37dc0b7
tree73441e9164128f4c123ff83abfef9a8aef5ced3b
parent0f2e3cd6c6554bda254111dee0746fea05aac047
parent8121bbc66f59f5c03939e3ce60575fcbc30ef764
Merge branch 'master' into Mario/invasion_types

# Conflicts:
# qcsrc/server/mutators/mutator/gamemode_invasion.qc
gamemodes-server.cfg
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc