From: Mario <zacjardine@y7mail.com>
Date: Sun, 12 Mar 2017 19:42:42 +0000 (+0000)
Subject: Merge branch 'Melanosuchus/fix_build' into 'master'
X-Git-Tag: xonotic-v0.8.2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=daa584caa15991aa216456dddb2b78abbe34d9d3;p=xonotic%2Fnetradiant.git

Merge branch 'Melanosuchus/fix_build' into 'master'

Fix compilation

See merge request !36
---

daa584caa15991aa216456dddb2b78abbe34d9d3