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

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

1071d1a0475ec16b0b65c7fa4375fc1080d71447