Merge branch 'master' into mirceakitsune/weapon_display
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Nov 2011 13:50:02 +0000 (15:50 +0200)
1  2 
data/qcsrc/server/cl_weaponsystem.qc
data/qcsrc/server/miscfunctions.qc
data/qcsrc/server/w_grabber.qc

Simple merge
Simple merge
Simple merge