Merge branch 'master' into mirceakitsune/weapon_display

author MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)

committer MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
author MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
committer MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
diff --cc data/qcsrc/server/cl_weaponsystem.qc
Simple merge
diff --cc data/qcsrc/server/miscfunctions.qc
Simple merge
diff --cc data/qcsrc/server/w_grabber.qc
Simple merge
author	MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
	Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
committer	MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
	Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
		1	2
data/qcsrc/server/cl_weaponsystem.qc	patch \|	diff1 \|	diff2 \|	blob \| history
data/qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history
data/qcsrc/server/w_grabber.qc	patch \|	diff1 \|	diff2 \|	blob \| history