From: Mario <mario.mario@y7mail.com>
Date: Sat, 14 Sep 2019 20:36:36 +0000 (+0000)
Subject: Merge branch 'martin-t/qc2rust' into 'master'
X-Git-Tag: xonotic-v0.8.5~1285
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d134ce0af0e04817a2a599f8187889d0a7bbc0ee;p=xonotic%2Fxonotic-data.pk3dir.git

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

Qc2rust branch with tiny changes

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

d134ce0af0e04817a2a599f8187889d0a7bbc0ee