Merge branch 'master' into Mario/teams_bitflag
authorMario <mario@smbclan.net>
Sun, 10 Jul 2016 08:03:57 +0000 (18:03 +1000)
committerMario <mario@smbclan.net>
Sun, 10 Jul 2016 08:03:57 +0000 (18:03 +1000)
commitee7a78f942624de2ab30112a798e3f663cf9cc2f
tree8db3e8e3c7fae77e577476e15a8336e0ce375698
parentec0b13540050fc7b33b7a7bd1ddb6d07c329b4f3
parentc64df22b635511ae2f1d12fd0f2f2a81315a83a6
Merge branch 'master' into Mario/teams_bitflag
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/server/mutators/mutator/gamemode_ca.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_domination.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/mutators/mutator/gamemode_tdm.qc