From: terencehill <piuntn@gmail.com>
Date: Sun, 11 Aug 2019 13:41:17 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/less_entities
X-Git-Tag: xonotic-v0.8.5~507^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2ac9a1c46a87b77bce234dd1655d0a026accc61;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/less_entities
---

e2ac9a1c46a87b77bce234dd1655d0a026accc61