From: Mario <mario@smbclan.net>
Date: Fri, 19 Oct 2018 21:10:58 +0000 (+1000)
Subject: Merge branch 'asciiwolf/xonotic-makefile-fix'
X-Git-Tag: xonotic-v0.8.5~145
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=0360202b4d19c963ae5f57f42ed370a6de67799a

Merge branch 'asciiwolf/xonotic-makefile-fix'
---

0360202b4d19c963ae5f57f42ed370a6de67799a