From: Cloudwalk <cloudwalk009@gmail.com>
Date: Wed, 23 Sep 2020 13:50:09 +0000 (-0400)
Subject: Merge branch 'master' into Cloudwalk/protocol_redesign
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d018542c92cc7a8a8ca3ba708809a4c61414e58d;p=xonotic%2Fdarkplaces.git

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

d018542c92cc7a8a8ca3ba708809a4c61414e58d