From: Mario <mario.mario@y7mail.com>
Date: Tue, 26 May 2020 14:13:38 +0000 (+0000)
Subject: Merge branch 'Mario/pure_entity_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~1023
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ef8267b00a03c3443bd7aad4f36e2eb7a88f7f4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/pure_entity_fix' into 'master'

Merge branch Mario/pure_entity_fix (XXS merge request)

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

3ef8267b00a03c3443bd7aad4f36e2eb7a88f7f4