projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f25d8b1
d6a8631
)
Merge branch 'Mario/xonoticless_fix' into 'master'
author
Mario <zacjardine@y7mail.com>
Thu, 27 Oct 2016 23:15:46 +0000
(23:15 +0000)
committer
Mario <zacjardine@y7mail.com>
Thu, 27 Oct 2016 23:15:46 +0000
(23:15 +0000)
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
Trivial merge