Merge remote-tracking branch 'origin/fruitiex/disable-shootanim'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:33:46 +0000 (14:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:33:46 +0000 (14:33 +0200)
commit776d57d3d746545313180c02b0c5e0e79af757bb
treec980f7f767b51a6a920d90181027d6282608668c
parentead48decf431922779263afaded66ac23a13802a
parent1ed05048f0d6b6dcbd28100285fe63524f388c8e
Merge remote-tracking branch 'origin/fruitiex/disable-shootanim'
qcsrc/server/cl_weapons.qc
qcsrc/server/cl_weaponsystem.qc