Merge branch 'master' into terencehill/accelerometer_fix
authorterencehill <piuntn@gmail.com>
Fri, 3 Jul 2015 13:49:33 +0000 (15:49 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 3 Jul 2015 13:49:33 +0000 (15:49 +0200)
1  2 
qcsrc/client/hud.qc

Simple merge