From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 12 Nov 2018 19:57:40 +0000 (+0100)
Subject: Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data... 
X-Git-Tag: xonotic-v0.8.5~1258^2~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac4f809419574ad8c2f10bc0531b303ed98c109f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into martin-t/globals
---

ac4f809419574ad8c2f10bc0531b303ed98c109f