From: terencehill <piuntn@gmail.com>
Date: Tue, 4 May 2021 15:12:14 +0000 (+0000)
Subject: Merge branch 'vehicles_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~420
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=642bba8a28a8949560906c23cffa281d154a46e9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'vehicles_fix' into 'master'

Resolve "Duplicated Raptor functions, nothing to do here"

Closes #2580

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

642bba8a28a8949560906c23cffa281d154a46e9