Merge branch 'terencehill/hud_no_joypad_keys' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 8 Jun 2016 08:33:39 +0000 (08:33 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 8 Jun 2016 08:33:39 +0000 (08:33 +0000)
Don't show joypad keys in the HUD if no joypad has been detected

See merge request !320

1  2 
qcsrc/client/main.qc

Simple merge