From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 9 Dec 2019 11:02:45 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/switchdelay
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmartin-t%2Fswitchdelay;p=xonotic%2Fxonotic-data.pk3dir.git

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

c0fe6e8431e6b726067475073b44a579d4ffc77c