X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=build.bat;h=0d39603d338ea8ad319410b8765c88078aacd410;hp=b58fbd9e47ad13a2cf8c7befb62029babb315e10;hb=0aed9f9d49f034aad7d8856db00fe42f3303826d;hpb=aed292b6937ad75773102b66d43a8b5d1eeec921

diff --git a/build.bat b/build.bat
index b58fbd9..0d39603 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,9 @@
 @echo off
 cd "./src/game"
 fpc -dUSE_FMOD -MDELPHI -O2 -Fi../lib/vampimg -Fi../lib/vampimg/JpegLib -Fi../lib/vampimg/ZLib -Fu../lib/vampimg -Fu../lib/vampimg/JpegLib -Fu../lib/vampimg/ZLib -FE../../bin -FU../../tmp Doom2DF.dpr
+<<<<<<< HEAD
 cd ".."
+=======
+cd "../.."
+>>>>>>> 32fab4b... can load map scripts from wads now
 pause
\ No newline at end of file