Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Tue, 24 May 2011 14:12:36 +0000 (16:12 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 24 May 2011 14:12:36 +0000 (16:12 +0200)
1  2 
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge