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)
commitb067640a0a39aa413ec687818cc402b9562d3a28
tree9b20cdd8d60aba0562b244ef7019a2107500b73c
parent5a00e37a696848dbeef75aa32a9192a2350242a4
parentbbf7625266c11f17acd42a6485689a9e3e0d7ee1
Merge branch 'master' into terencehill/physics_panel_update
qcsrc/client/hud.qc