]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ed18f8 ca28b32)
Merge branch 'martin-t/weapon_switch' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Oct 2018 16:47:21 +0000 (16:47 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Oct 2018 16:47:21 +0000 (16:47 +0000)
Option to not reload by weapswitch and not fallback to other weaps from the impulse

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


Trivial merge