Merge branch 'master' into terencehill/physics_panel_update
authorterencehill <piuntn@gmail.com>
Wed, 10 Aug 2011 13:45:05 +0000 (15:45 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 10 Aug 2011 13:45:05 +0000 (15:45 +0200)
1  2 
qcsrc/client/hud.qc

Simple merge