Merge branch 'master' into Mario/killother

author Mario <mario@smbclan.net>

Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)

committer Mario <mario@smbclan.net>

Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
author Mario <mario@smbclan.net>
Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
committer Mario <mario@smbclan.net>
Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
diff --cc qcsrc/common/mutators/mutator/buffs/buffs.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/sandbox/sandbox.qc
Simple merge
diff --cc qcsrc/common/vehicles/sv_vehicles.qc
Simple merge
author	Mario <mario@smbclan.net>
	Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
committer	Mario <mario@smbclan.net>
	Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
		1	2
qcsrc/common/mutators/mutator/buffs/buffs.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/sandbox/sandbox.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	patch \|	diff1 \|	diff2 \|	blob \| history