Merge branch 'timoore/fire-fix' into next

[flightgear.git] / src / Include / config.h-msvc6

diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6
index 67470ea815cbe57596d25b6fcdad934a8237db8a..1b7f8ddc6b56986091e4fdeedae4bf377ba017b3 100644 (file)
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -46,11 +46,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-<<<<<<< config.h-msvc6
-#define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0-rc2"
-=======
 #define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0"
->>>>>>> 1.13
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -68,11 +64,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-<<<<<<< config.h-msvc6
-#define VERSION "2.0.0-rc2"
-=======
 #define VERSION "2.0.0"
->>>>>>> 1.13
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1