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)
commit9a2efec7718c9dd4805a8982f475f86f05509979
tree99a8bc2343602ac07b993959da1144c3984de01a
parent6f964ff41762dd2ccb8627aa54dc7e10070e1962
parenta36e826e580587d3ec8ae4e106cdf10620ad2af1
Merge branch 'master' into terencehill/centerprint_stuff
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc