+ Added Steel Storm game

[xonotic/darkplaces.git] / darkplaces-sdl.dev

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index e4d71d8d7731a10326712bdfecb167cc232f4f1e..78227ada02aef8a79ad10ec3790908ef9d749ee7 100755 (executable)
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,7 +1,15 @@
 [Project]\r
 FileName=darkplaces-sdl.dev\r
 Name=DarkPlaces\r
+<<<<<<< .mine\r
+<<<<<<< .mine\r
+UnitCount=182\r
+=======\r
+UnitCount=175\r
+=======\r
 UnitCount=181\r
+>>>>>>> .r9892\r
+>>>>>>> .r9586\r
 Type=0\r
 Ver=1\r
 ObjFiles=\r
@@ -1778,7 +1786,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit182]\r
-FileName=SDLMain.h\r
+FileName=intoverflow.h\r
 CompileCpp=0\r
 Folder=Header Files\r
 Compile=1\r