Revert previous commit.

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

diff --git a/src/Include/config.h-msvc71 b/src/Include/config.h-msvc71
index 5d758a284b1ed477c578c221cbe4ab6286c779c9..0e7fc3835fc08156cec96f9d349bd5571094294f 100755 (executable)
--- a/src/Include/config.h-msvc71
+++ b/src/Include/config.h-msvc71
@@ -19,11 +19,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-<<<<<<< config.h-msvc71
-#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0-rc2"
-=======
 #define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0"
->>>>>>> 1.7
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -41,11 +37,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-<<<<<<< config.h-msvc71
-#define VERSION "2.0.0-rc2"
-=======
 #define VERSION "2.0.0"
->>>>>>> 1.7
 #ifndef  FG_VERSION     /* allow override */
 #define  FG_VERSION     7
 #endif   /* FG_VERSION */

diff --git a/src/Include/config.h-msvc8 b/src/Include/config.h-msvc8
index ad0a421b01c72077ca673ddbaf4a4c1d423f02a6..fd8ce66b9ca4518d0ca87f475e4a877fdc25f322 100755 (executable)
--- a/src/Include/config.h-msvc8
+++ b/src/Include/config.h-msvc8
@@ -50,11 +50,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-<<<<<<< config.h-msvc8
-#define FLIGHTGEAR_VERSION "MSVC8-WIN32-2.0.0-rc2"
-=======
 #define FLIGHTGEAR_VERSION "MSVC8-WIN32-2.0.0"
->>>>>>> 1.14
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -72,11 +68,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-<<<<<<< config.h-msvc8
-#define VERSION "2.0.0-rc2"
-=======
 #define VERSION "2.0.0"
->>>>>>> 1.14
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1