From: Cloudwalk <cloudwalk009@gmail.com>
Date: Fri, 30 Jul 2021 18:13:50 +0000 (-0400)
Subject: Merge branch 'master' into Cloudwalk/cvar_overhaul
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3471b94f25a734c0a737e919fa642083a0ab487;p=xonotic%2Fdarkplaces.git

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

a3471b94f25a734c0a737e919fa642083a0ab487