From: Mario <mario.mario@y7mail.com>
Date: Sun, 29 Sep 2019 08:29:53 +0000 (+0000)
Subject: Merge branch 'martin-t/globals' into 'master'
X-Git-Tag: xonotic-v0.8.5~1258
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aec48d76571bf181f87137bc2390cbce321127fa;p=xonotic%2Fxonotic-data.pk3dir.git

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

Deglobalization - part 1

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

aec48d76571bf181f87137bc2390cbce321127fa