Merge branch 'master' into Mario/intrusive 344/head
authorMario <mario@smbclan.net>
Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
committerMario <mario@smbclan.net>
Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
1  2 
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc

Simple merge