From: Mario <zacjardine@y7mail.com>
Date: Sun, 21 Oct 2018 16:47:21 +0000 (+0000)
Subject: Merge branch 'martin-t/weapon_switch' into 'master'
X-Git-Tag: xonotic-v0.8.5~1751
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e2516570a59a8cfb46c528d6d50cbb2d6a39b32b

Merge branch 'martin-t/weapon_switch' into 'master'

Option to not reload by weapswitch and not fallback to other weaps from the impulse

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

e2516570a59a8cfb46c528d6d50cbb2d6a39b32b