Merge branch 'Mario/xonoticless_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 27 Oct 2016 23:15:46 +0000 (23:15 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 27 Oct 2016 23:15:46 +0000 (23:15 +0000)
commit04338413d72286b6f5a6377bc43a1fac55976a59
tree5f7e0ac8dbb1bfaaeb483c191a3b6dc370314f12
parentf25d8b1740f6d6a093ea537b9f1091bd68068c17
parentd6a8631deda83a641a1d271ef570bdf7e89a1259
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