Merge branch 'terencehill/aim_shake_fix'
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:24:59 +0000 (11:24 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:24:59 +0000 (11:24 +1100)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc

Simple merge
Simple merge