From: terencehill <piuntn@gmail.com>
Date: Wed, 17 Nov 2021 09:27:59 +0000 (+0000)
Subject: Merge branch 'z411/ca_useammunition' into 'master'
X-Git-Tag: xonotic-v0.8.5~295
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad297e7e15e37a3268cea3c72bb09d515c4f55cb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/ca_useammunition' into 'master'

Make CA/FT/LMS respect g_use_ammunition

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

ad297e7e15e37a3268cea3c72bb09d515c4f55cb