From: Martin Taibr Date: Sat, 17 Aug 2019 18:32:58 +0000 (+0200) Subject: Merge branch 'martin-t/globals' into martin-t/master2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d88bb1f7aa947932d346fcdcb6ab3baa8d33bf2;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'martin-t/globals' into martin-t/master2 --- 7d88bb1f7aa947932d346fcdcb6ab3baa8d33bf2