Merge branch 'syd/ias-limit' into next

[flightgear.git] / src / Main / options.hxx

diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index a6f8f42af3eb6569eba25705c8bb7eac26c35d9f..2bdb86da5252f576c6baf71b8e2e3d487ba2b1c0 100644 (file)
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -30,11 +30,9 @@
 #endif
 
 extern void fgSetDefaults ();
-extern string fgScanForRoot (int argc, char ** argv);
-extern string fgScanForRoot (const string &file_path);
 extern void fgParseArgs (int argc, char ** argv);
 extern void fgParseOptions (const string &file_path);
 extern void fgUsage (bool verbose = false);
-extern void fgShowAircraft();
+extern void fgShowAircraft(const SGPath &path, bool recursive);
 
 #endif /* _OPTIONS_HXX */