From: Mario <mario@smbclan.net>
Date: Sun, 29 Apr 2018 14:01:55 +0000 (+1000)
Subject: Merge branch 'master' into Mario/winfix
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=f034b8003de1bcbc86b3fb7c44026ebc84055cff

Merge branch 'master' into Mario/winfix
---

f034b8003de1bcbc86b3fb7c44026ebc84055cff