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)
1  2 
qcsrc/server/cl_weapons.qc
qcsrc/server/cl_weaponsystem.qc

Simple merge
Simple merge