From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Oct 2018 14:44:49 +0000 (+0000)
Subject: Merge branch 'Mario/win64_v2' into 'master'
X-Git-Tag: xonotic-v0.8.5~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27e6c3d23fa384e537148d6747835e8a240391f1;p=xonotic%2Fxonotic.git

Merge branch 'Mario/win64_v2' into 'master'

Merge branch Mario/win64_v2 (S merge request)

See merge request xonotic/xonotic!44
---

27e6c3d23fa384e537148d6747835e8a240391f1