Merge branch 'durk/version'

diff --git a/Thanks b/Thanks
index 651d7f9bb85ec54c8fa4fb61a16d25b4f9dcc645..0a9c0655e35b119c442fdfa4234bddc90daea1c4 100644 (file)
--- a/Thanks
+++ b/Thanks
@@ -39,7 +39,7 @@ Michele America <nomimarketing@mail.telepac.pt>
 Emmanuel Baranger <>
   Many, many very nice aircraft models.
 
-Andrei Barbu "T"Eval" teval@myrealbox.com
+Andrei Barbu <andrei@0xab.com>
   Designed and implemented the current version of the FlightGear website.
 
 

diff --git a/configure.ac b/configure.ac
index d1e424210460797234b3ce260e7d8cfb2782e051..42c49b571753342c81c618a8cd48cb141839ab76 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 1.9.1)
+AM_INIT_AUTOMAKE(FlightGear, 2.0.0-rc2)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index fdf0bfd38fb4a8b145d8dc6340d7c293a197e2d7..7f7152d8d031d8e6c8b311e2ebe7f291af53b7bc 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -891,7 +891,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "1.9.0";
+    static char required_version[] = "2.0.0";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application