From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Oct 2016 23:15:46 +0000 (+0000)
Subject: Merge branch 'Mario/xonoticless_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~470
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04338413d72286b6f5a6377bc43a1fac55976a59;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/xonoticless_fix' into 'master'

Merge branch Mario/xonoticless_fix (M merge request)

Moves some stuff around so the game code can be compiled with -DXONOTIC=0 again.

See merge request !381
---

04338413d72286b6f5a6377bc43a1fac55976a59