Merge branch 'Mario/win64_v2' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 2 Oct 2018 14:44:49 +0000 (14:44 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 2 Oct 2018 14:44:49 +0000 (14:44 +0000)
commit27e6c3d23fa384e537148d6747835e8a240391f1
treed460145f92218a2897fba5a884df205195c2fefb
parent43700795317b5ccf9ad20fb27d4a496d1393dbe4
parent916a92dcc938153256cdbb5fc6925e5123bb0605
Merge branch 'Mario/win64_v2' into 'master'

Merge branch Mario/win64_v2 (S merge request)

See merge request xonotic/xonotic!44