fly/flightgear
1
0
Fork 0
Code Activity

Update version number.

Browse source
This commit is contained in:
durk 2010-02-05 05:40:15 +00:00 • committed by Tim Moore
parent 446c2064a5
commit ce6e1dc07c
4 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -10,7 +10,7 @@ AC_PREREQ(2.52)
dnl Initialize the automake stuff dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(FlightGear, 2.0.0-rc2) AM_INIT_AUTOMAKE(FlightGear, 2.0.0)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET

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

@ -46,7 +46,11 @@
#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
@ -64,7 +68,11 @@
#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,7 +19,11 @@
#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
@ -37,7 +41,11 @@
#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,7 +50,11 @@
#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
@ -68,7 +72,11 @@
#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