fly/flightgear
1
0
Fork 0
Code Activity

Revert previous commit.

Browse source
This commit is contained in:
durk 2010-02-05 06:00:12 +00:00 committed by Tim Moore
parent ce6e1dc07c
commit eccc7838b1
3 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Include/config.h-msvc6
View file

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

8
src/Include/config.h-msvc71
View file

@ -19,11 +19,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* 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" #define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0"
>>>>>>> 1.7
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -41,11 +37,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
<<<<<<< config.h-msvc71
#define VERSION "2.0.0-rc2"
=======
#define VERSION "2.0.0" #define VERSION "2.0.0"
>>>>>>> 1.7
#ifndef FG_VERSION /* allow override */ #ifndef FG_VERSION /* allow override */
#define FG_VERSION 7 #define FG_VERSION 7
#endif /* FG_VERSION */ #endif /* FG_VERSION */

8
src/Include/config.h-msvc8
View file

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