summaryrefslogtreecommitdiff
path: root/The Mana World.dev
diff options
context:
space:
mode:
Diffstat (limited to 'The Mana World.dev')
-rw-r--r--The Mana World.dev8
1 files changed, 6 insertions, 2 deletions
diff --git a/The Mana World.dev b/The Mana World.dev
index 9c7bb352..3dbc30c1 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -11,7 +11,7 @@ PrivateResource=The_Mana_World_private.rc
ResourceIncludes=
MakeIncludes=
Compiler=
-CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_-D__DEBUG_@@_
+CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_
Linker=-lguichan_@@_-lguichan_allegro_@@_-lalleg_@@_-lwsock32_@@_-lSDL_mixer_@@_-lSDL_@@_
IsCpp=1
Icon=The Mana World.ico
@@ -33,7 +33,11 @@ CompilerSettings=0010001001001000001101
Major=0
Minor=0
Release=8
-Build=833
+<<<<<<< The Mana World.dev
+Build=809
+=======
+Build=851
+>>>>>>> 1.76
LanguageID=1033
CharsetID=1252
CompanyName=The Mana World Development Team