From: Cloudwalk <cloudwalk009@gmail.com>
Date: Thu, 8 Oct 2020 12:58:02 +0000 (-0400)
Subject: Merge branch 'master' into Cloudwalk/protocol_redesign
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=456959a74acf5fd77b10dc6ac1cf8602678485d2;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into Cloudwalk/protocol_redesign
---

456959a74acf5fd77b10dc6ac1cf8602678485d2