Merge branch 'master' into terencehill/freezetag_fixes
authorterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:51:33 +0000 (23:51 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:51:33 +0000 (23:51 +0200)
commit8ec332c7d3cffdc6b39c3ada385fa41995630589
tree88c5dc4d4c83479f1434328765e2b42631d78140
parent21ec77d388ba3f59ca65d8caae40ce73f327ca12
parenta4ccbd75da12da9090f3d25ad4dc9edd0efe3060
Merge branch 'master' into terencehill/freezetag_fixes
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc