Merge branch 'next' of gitorious.org:fg/flightgear into next

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

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