From: Tim Moore Date: Mon, 21 Dec 2009 23:16:38 +0000 (+0100) Subject: Merge branches 'jmt/aircraft-name' and 'jmt/runway' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d2c7179cd09636c20a19870d95664fb7755fae76;p=flightgear.git Merge branches 'jmt/aircraft-name' and 'jmt/runway' --- d2c7179cd09636c20a19870d95664fb7755fae76 diff --cc src/Main/fg_init.cxx index d10bf4076,08d453730,2e8713a17..26a7987f4 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@@@ -135,8 -139,11 -137,10 +137,9 @@@@ #endif using std::string; + +using namespace boost::algorithm; --class Sound; extern const char *default_root; --float init_volume; // Scan the command line options for the specified option and return