From: Mario <zacjardine@y7mail.com>
Date: Wed, 8 Jun 2016 08:33:39 +0000 (+0000)
Subject: Merge branch 'terencehill/hud_no_joypad_keys' into 'master'
X-Git-Tag: xonotic-v0.8.2~887
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3d4a324cc2e15c1eb99209674942506eb998e2ec

Merge branch 'terencehill/hud_no_joypad_keys' into 'master'

Don't show joypad keys in the HUD if no joypad has been detected



See merge request !320
---

3d4a324cc2e15c1eb99209674942506eb998e2ec