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)
commit1383ce28153c75886cd6358b29a86065131ad943
tree9d8da4ab107a872ab1d219e45326aa851d97b6e2
parent8b9368db845ec0813685b75be51fa8cc4d298759
parent6d50e7225c6e9875d677d4cf05a7cf9d1bba2c19
Merge branch 'master' into mirceakitsune/weapon_display
data/qcsrc/server/cl_weaponsystem.qc
data/qcsrc/server/miscfunctions.qc
data/qcsrc/server/w_grabber.qc