Ready experimental branch for remerging into master

This commit is contained in:
Melissa Goad
2017-07-27 14:48:43 -05:00
parent 551f265970
commit d3adc13445
2 changed files with 10 additions and 4 deletions

View File

@@ -28,6 +28,6 @@ EXTRAS =
DEBUG = n
OPTIM = n
X64 = y
DEV_BRANCH = n
# End of Makefile.mingw64.