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

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

f5de016d71b187fd0df0bd3e906c1e424dc46a06