Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:03:00 +0000 (23:03 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:03:00 +0000 (23:03 +0300)
commitbc3c96311eab9ac5d775a69dc0496a0d7b789284
treecad0f5035b6eb8ff6e4f0b25ad8869321c89dd76
parent5d7727e34f57b35e91f5213eff03cc958ca618d0
parent15c235b4f1780fd29cb2df5ccfdc6c4c8016442c
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc