From: Cloudwalk <cloudwalk009@gmail.com>
Date: Tue, 21 Jul 2020 19:12:48 +0000 (-0400)
Subject: Merge branch 'master' into Cloudwalk/32bitprogs
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=080ee27c4f3a2c9198572a11833bbb5c91b5df1a;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into Cloudwalk/32bitprogs
---

080ee27c4f3a2c9198572a11833bbb5c91b5df1a