From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 16 Dec 2019 13:36:23 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/stalemate
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18eec6f848d82c3b34a6d5b9b5675ee78ca53883;p=xonotic%2Fxonotic-data.pk3dir.git

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

18eec6f848d82c3b34a6d5b9b5675ee78ca53883