Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 23 Jan 2011 16:01:49 +0000 (18:01 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 23 Jan 2011 16:01:49 +0000 (18:01 +0200)
commit36810e8ddba12c1959bc07e4c80630454c6f85a8
treebb6ea9f8b6dc7101f5824d712dd80b1c457a8a6e
parent3a2e290a9092f704dffaef8b50fc4be0dca8bb35
parentd450d0fb332990c59fd4573c6a5c6a873905ffd4
Merge branch 'master' into mirceakitsune/universal_reload_system
18 files changed:
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_porto.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_sniperrifle.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc