From: terencehill <piuntn@gmail.com>
Date: Tue, 9 Apr 2019 17:27:20 +0000 (+0000)
Subject: Merge branch 'byteManiak/bindingsReset' into 'master'
X-Git-Tag: xonotic-v0.8.5~1556
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6530e3b3cbd2ab6f0026bd0131bce4ed8f702b82;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'byteManiak/bindingsReset' into 'master'

Fix #2203: "Settings->Input->Reset all should ask for confirmation"

Closes #2203

See merge request xonotic/xonotic-data.pk3dir!643
---

6530e3b3cbd2ab6f0026bd0131bce4ed8f702b82