[pkg-fgfs-crew] [flightgear] 01/01: Merge branch 'upstream', i.e. sources for 2.12.0.

Markus Wanner markus_wanner-guest at alioth.debian.org
Sat Sep 21 18:40:51 UTC 2013


This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to branch master
in repository flightgear.

commit 33f2125eecf375206dc916e010978c534a552a72
Merge: aeee694 1accf4e
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sat Sep 21 20:37:59 2013 +0200

    Merge branch 'upstream', i.e. sources for 2.12.0.

 CMakeLists.txt                                     |   50 +-
 CMakeModules/ConfigureMsvc3rdParty.cmake           |    2 +-
 CMakeModules/FindSimGear.cmake                     |    5 +
 man/CMakeLists.txt                                 |   21 +-
 src/AIModel/AIAircraft.cxx                         |  109 +-
 src/AIModel/AIAircraft.hxx                         |    3 +-
 src/AIModel/AIBallistic.cxx                        |   25 +-
 src/AIModel/AIBallistic.hxx                        |   22 +-
 src/AIModel/AIBase.cxx                             |  226 ++--
 src/AIModel/AIBase.hxx                             |   78 +-
 src/AIModel/AIEscort.cxx                           |    2 +-
 src/AIModel/AIEscort.hxx                           |    4 +-
 src/AIModel/AIFlightPlan.cxx                       |    3 +-
 src/AIModel/AIFlightPlan.hxx                       |    8 -
 src/AIModel/AIFlightPlanCreate.cxx                 |    4 +-
 src/AIModel/AIFlightPlanCreateCruise.cxx           |    3 +-
 src/AIModel/AIFlightPlanCreatePushBack.cxx         |    4 +-
 src/AIModel/AIGroundVehicle.cxx                    |    2 +
 src/AIModel/AIManager.cxx                          |  334 ++++--
 src/AIModel/AIManager.hxx                          |   51 +-
 src/AIModel/AIMultiplayer.cxx                      |    1 +
 src/AIModel/AIShip.cxx                             |    1 +
 src/AIModel/AIShip.hxx                             |   18 +-
 src/AIModel/AIStorm.cxx                            |   16 +-
 src/AIModel/AITanker.cxx                           |    2 +
 src/AIModel/AITanker.hxx                           |    4 +-
 src/AIModel/AIThermal.cxx                          |   22 +-
 src/AIModel/AIWingman.cxx                          |    8 +-
 src/AIModel/submodel.cxx                           |    2 +
 src/ATC/CommStation.cxx                            |    8 +-
 src/ATC/CommStation.hxx                            |   11 +-
 src/ATC/atc_mgr.cxx                                |   60 +-
 src/ATC/atc_mgr.hxx                                |    4 +-
 src/ATC/atcdialog.cxx                              |    4 +-
 src/ATC/trafficcontrol.cxx                         |    3 +-
 src/ATC/trafficcontrol.hxx                         |   39 +-
 src/ATCDCL/ATC.cxx                                 |    2 +-
 src/ATCDCL/ATCutils.hxx                            |    2 +-
 src/ATCDCL/atis.cxx                                |    4 +-
 src/Aircraft/FlightHistory.cxx                     |    1 +
 src/Aircraft/FlightHistory.hxx                     |    4 +-
 src/Aircraft/flightrecorder.cxx                    |   17 +-
 src/Aircraft/flightrecorder.hxx                    |    1 +
 src/Aircraft/replay.cxx                            |    1 +
 src/Airports/CMakeLists.txt                        |    5 +-
 src/Airports/{simple.cxx => airport.cxx}           |  314 +++++-
 src/Airports/{simple.hxx => airport.hxx}           |  142 ++-
 src/Airports/airports_fwd.hxx                      |  115 ++
 src/Airports/apt_loader.cxx                        |   82 +-
 src/Airports/dynamicloader.cxx                     |    2 +-
 src/Airports/dynamics.cxx                          |    6 +-
 src/Airports/dynamics.hxx                          |   12 +-
 src/Airports/gnnode.hxx                            |    4 -
 src/Airports/groundnetwork.cxx                     |   19 +-
 src/Airports/groundnetwork.hxx                     |   36 +-
 src/Airports/parking.hxx                           |    8 +-
 src/Airports/runwaybase.cxx                        |   13 +-
 src/Airports/runwaybase.hxx                        |    8 +-
 src/Airports/runwayprefs.cxx                       |   54 +-
 src/Airports/runwayprefs.hxx                       |   52 +-
 src/Airports/runways.cxx                           |   46 +-
 src/Airports/runways.hxx                           |   51 +-
 src/Airports/sidstar.cxx                           |    8 +-
 src/Airports/sidstar.hxx                           |   26 +-
 src/Airports/xmlloader.cxx                         |    4 +-
 src/Airports/xmlloader.hxx                         |    4 +-
 src/Autopilot/autopilot.cxx                        |   42 +-
 src/Autopilot/autopilot.hxx                        |    8 +-
 src/Autopilot/pisimplecontroller.cxx               |    2 +-
 src/Autopilot/predictor.cxx                        |    2 +-
 src/Autopilot/route_mgr.cxx                        |  175 +--
 src/Autopilot/route_mgr.hxx                        |   36 +-
 src/Canvas/FGCanvasSystemAdapter.cxx               |   39 +-
 src/Canvas/FGCanvasSystemAdapter.hxx               |   23 +-
 src/Canvas/canvas_mgr.cxx                          |   58 +-
 src/Canvas/canvas_mgr.hxx                          |    6 +
 src/Canvas/gui_mgr.cxx                             |  212 ++--
 src/Canvas/gui_mgr.hxx                             |   19 +-
 src/Canvas/window.cxx                              |  208 +++-
 src/Canvas/window.hxx                              |   51 +-
 src/Cockpit/NavDisplay.cxx                         |    3 +-
 src/Cockpit/NavDisplay.hxx                         |    2 +-
 src/Cockpit/groundradar.cxx                        |   12 +-
 src/Cockpit/od_gauge.cxx                           |  138 +--
 src/Cockpit/od_gauge.hxx                           |   50 +-
 src/Cockpit/panel.cxx                              |   42 +-
 src/Environment/atmosphere.cxx                     |    3 +-
 src/Environment/atmosphere.hxx                     |    3 -
 src/Environment/environment_mgr.cxx                |    2 +-
 src/Environment/fgclouds.cxx                       |   50 +-
 src/Environment/fgclouds.hxx                       |   28 +-
 src/Environment/metarairportfilter.hxx             |    2 +-
 src/Environment/metarproperties.cxx                |   33 +-
 src/Environment/metarproperties.hxx                |   12 +-
 src/Environment/realwx_ctrl.cxx                    |   34 +-
 src/FDM/ExternalNet/ExternalNet.cxx                |    8 +-
 src/FDM/JSBSim/CMakeLists.txt                      |   20 +
 src/FDM/JSBSim/FGFDMExec.cpp                       |  246 +++--
 src/FDM/JSBSim/FGFDMExec.h                         |   58 +-
 src/FDM/JSBSim/FGJSBBase.cpp                       |    4 +-
 src/FDM/JSBSim/JSBSim.cxx                          |   30 +-
 src/FDM/JSBSim/JSBSim.hxx                          |    2 +
 .../JSBSim/initialization/FGInitialCondition.cpp   |   78 +-
 src/FDM/JSBSim/initialization/FGInitialCondition.h |   25 +-
 src/FDM/JSBSim/initialization/FGLinearization.cpp  |  114 ++
 src/FDM/JSBSim/initialization/FGLinearization.h    |   47 +
 src/FDM/JSBSim/initialization/FGSimplexTrim.cpp    |  119 ++
 src/FDM/JSBSim/initialization/FGSimplexTrim.h      |   81 ++
 src/FDM/JSBSim/initialization/FGTrim.cpp           |    4 +-
 src/FDM/JSBSim/initialization/FGTrimAxis.cpp       |   11 +-
 src/FDM/JSBSim/initialization/FGTrimmer.cpp        |  381 +++++++
 src/FDM/JSBSim/initialization/FGTrimmer.h          |   66 ++
 src/FDM/JSBSim/input_output/FGGroundCallback.h     |    7 +-
 src/FDM/JSBSim/input_output/FGOutputFG.cpp         |  352 ++++++
 .../FGOutputFG.h}                                  |   57 +-
 .../FGOutputFile.cpp}                              |   78 +-
 src/FDM/JSBSim/input_output/FGOutputFile.h         |  131 +++
 src/FDM/JSBSim/input_output/FGOutputSocket.cpp     |  402 +++++++
 .../FGInput.h => input_output/FGOutputSocket.h}    |   96 +-
 src/FDM/JSBSim/input_output/FGOutputTextFile.cpp   |  390 +++++++
 .../FGInput.h => input_output/FGOutputTextFile.h}  |   77 +-
 src/FDM/JSBSim/input_output/FGOutputType.cpp       |  275 +++++
 src/FDM/JSBSim/input_output/FGOutputType.h         |  221 ++++
 src/FDM/JSBSim/input_output/FGPropertyManager.cpp  |  114 +-
 src/FDM/JSBSim/input_output/FGPropertyManager.h    |  103 +-
 src/FDM/JSBSim/input_output/FGScript.cpp           |  117 +-
 src/FDM/JSBSim/input_output/FGScript.h             |   14 +-
 src/FDM/JSBSim/input_output/FGXMLElement.cpp       |  117 +-
 src/FDM/JSBSim/input_output/FGXMLElement.h         |   12 +-
 src/FDM/JSBSim/input_output/FGXMLFileRead.h        |   15 +-
 src/FDM/JSBSim/input_output/net_fdm.hxx            |   54 +-
 src/FDM/JSBSim/input_output/string_utilities.h     |    7 +-
 src/FDM/JSBSim/math/FGCondition.cpp                |   41 +-
 src/FDM/JSBSim/math/FGCondition.h                  |    4 +-
 src/FDM/JSBSim/math/FGFunction.cpp                 |   97 +-
 src/FDM/JSBSim/math/FGFunction.h                   |  564 +++++++++-
 src/FDM/JSBSim/math/FGMatrix33.cpp                 |   38 +-
 src/FDM/JSBSim/math/FGMatrix33.h                   |    8 +-
 src/FDM/JSBSim/math/FGModelFunctions.cpp           |   16 +-
 src/FDM/JSBSim/math/FGNelderMead.cpp               |  385 +++++++
 src/FDM/JSBSim/math/FGNelderMead.h                 |   96 ++
 src/FDM/JSBSim/math/FGPropertyValue.cpp            |    7 +-
 src/FDM/JSBSim/math/FGPropertyValue.h              |    8 +-
 src/FDM/JSBSim/math/FGQuaternion.cpp               |   37 +-
 src/FDM/JSBSim/math/FGQuaternion.h                 |    5 +-
 src/FDM/JSBSim/math/FGStateSpace.cpp               |  189 ++++
 src/FDM/JSBSim/math/FGStateSpace.h                 |  934 ++++++++++++++++
 src/FDM/JSBSim/math/FGTable.cpp                    |    4 +-
 src/FDM/JSBSim/math/FGTable.h                      |   14 +-
 src/FDM/JSBSim/models/FGAccelerations.cpp          |   35 +-
 src/FDM/JSBSim/models/FGAccelerations.h            |   16 +-
 src/FDM/JSBSim/models/FGAerodynamics.cpp           |   18 +-
 src/FDM/JSBSim/models/FGAerodynamics.h             |   18 +-
 src/FDM/JSBSim/models/FGAircraft.cpp               |   32 +-
 src/FDM/JSBSim/models/FGAircraft.h                 |    9 +-
 src/FDM/JSBSim/models/FGAtmosphere.cpp             |   45 +-
 src/FDM/JSBSim/models/FGAtmosphere.h               |   11 +-
 src/FDM/JSBSim/models/FGAuxiliary.cpp              |   41 +-
 src/FDM/JSBSim/models/FGAuxiliary.h                |   14 +-
 src/FDM/JSBSim/models/FGExternalForce.cpp          |   25 +-
 src/FDM/JSBSim/models/FGExternalForce.h            |    6 +-
 src/FDM/JSBSim/models/FGFCS.cpp                    |  199 ++--
 src/FDM/JSBSim/models/FGFCS.h                      |   11 +-
 src/FDM/JSBSim/models/FGFCSChannel.h               |  128 +++
 src/FDM/JSBSim/models/FGGasCell.cpp                |   20 +-
 src/FDM/JSBSim/models/FGGasCell.h                  |   16 +-
 src/FDM/JSBSim/models/FGGroundReactions.cpp        |   52 +-
 src/FDM/JSBSim/models/FGGroundReactions.h          |    5 +-
 src/FDM/JSBSim/models/FGInertial.h                 |    3 +-
 src/FDM/JSBSim/models/FGInput.cpp                  |   31 +-
 src/FDM/JSBSim/models/FGInput.h                    |    6 +-
 src/FDM/JSBSim/models/FGLGear.cpp                  |   97 +-
 src/FDM/JSBSim/models/FGLGear.h                    |   17 +-
 src/FDM/JSBSim/models/FGMassBalance.cpp            |   56 +-
 src/FDM/JSBSim/models/FGMassBalance.h              |    9 +-
 src/FDM/JSBSim/models/FGModel.cpp                  |    5 +-
 src/FDM/JSBSim/models/FGOutput.cpp                 | 1106 +++----------------
 src/FDM/JSBSim/models/FGOutput.h                   |  158 +--
 src/FDM/JSBSim/models/FGPropagate.cpp              |   57 +-
 src/FDM/JSBSim/models/FGPropagate.h                |   44 +-
 src/FDM/JSBSim/models/FGPropulsion.cpp             |   28 +-
 src/FDM/JSBSim/models/atmosphere/FGWinds.cpp       |    6 +-
 .../models/flight_control/FGAccelerometer.cpp      |   10 +-
 .../JSBSim/models/flight_control/FGActuator.cpp    |   72 +-
 src/FDM/JSBSim/models/flight_control/FGActuator.h  |   20 +-
 .../JSBSim/models/flight_control/FGDeadBand.cpp    |    3 +-
 src/FDM/JSBSim/models/flight_control/FGDeadBand.h  |    7 +-
 .../models/flight_control/FGFCSComponent.cpp       |    6 +-
 .../JSBSim/models/flight_control/FGFCSComponent.h  |   13 +-
 .../JSBSim/models/flight_control/FGFCSFunction.cpp |    3 +-
 src/FDM/JSBSim/models/flight_control/FGFilter.h    |    8 +-
 src/FDM/JSBSim/models/flight_control/FGGain.h      |    6 +-
 src/FDM/JSBSim/models/flight_control/FGGyro.cpp    |    4 +-
 .../models/flight_control/FGMagnetometer.cpp       |    4 +-
 src/FDM/JSBSim/models/flight_control/FGPID.cpp     |   10 +-
 src/FDM/JSBSim/models/flight_control/FGPID.h       |   19 +-
 src/FDM/JSBSim/models/flight_control/FGSensor.cpp  |    4 +-
 src/FDM/JSBSim/models/flight_control/FGSensor.h    |    6 +-
 src/FDM/JSBSim/models/flight_control/FGSwitch.cpp  |  159 +--
 src/FDM/JSBSim/models/flight_control/FGSwitch.h    |   39 +-
 src/FDM/JSBSim/models/propulsion/FGEngine.cpp      |    5 +-
 src/FDM/JSBSim/models/propulsion/FGEngine.h        |    5 +-
 src/FDM/JSBSim/models/propulsion/FGPropeller.cpp   |   24 +-
 src/FDM/JSBSim/models/propulsion/FGRocket.cpp      |   13 +-
 src/FDM/JSBSim/models/propulsion/FGRocket.h        |   13 +-
 src/FDM/JSBSim/models/propulsion/FGRotor.h         |    6 +-
 src/FDM/JSBSim/models/propulsion/FGTank.cpp        |   41 +-
 src/FDM/JSBSim/models/propulsion/FGTank.h          |    3 +-
 src/FDM/JSBSim/models/propulsion/FGThruster.cpp    |   31 +-
 src/FDM/JSBSim/models/propulsion/FGTurbine.cpp     |    7 +-
 src/FDM/SP/ADA.cxx                                 |    1 +
 src/FDM/UFO.cxx                                    |    2 +-
 src/FDM/YASim/Rotor.cpp                            |   25 +-
 src/FDM/YASim/YASim.cxx                            |    7 +-
 src/GUI/AirportList.cxx                            |    2 +-
 src/GUI/CMakeLists.txt                             |   19 +-
 src/GUI/CanvasWidget.cxx                           |   41 +-
 src/GUI/CanvasWidget.hxx                           |   26 +-
 src/GUI/CocoaFileDialog.hxx                        |   22 +
 src/GUI/CocoaFileDialog.mm                         |  138 +++
 .../markerbeacon.hxx => GUI/CocoaMouseCursor.hxx}  |   39 +-
 src/GUI/CocoaMouseCursor.mm                        |  114 ++
 src/GUI/FGPUIDialog.cxx                            |  160 ++-
 src/GUI/FGPUIDialog.hxx                            |   90 +-
 src/GUI/FileDialog.cxx                             |  172 +++
 src/GUI/FileDialog.hxx                             |   85 ++
 src/GUI/MapWidget.cxx                              |  325 ++++--
 src/GUI/MapWidget.hxx                              |   16 +-
 src/GUI/MouseCursor.cxx                            |  246 +++++
 src/GUI/MouseCursor.hxx                            |   65 ++
 src/GUI/PUIFileDialog.cxx                          |   93 ++
 src/GUI/PUIFileDialog.hxx                          |   30 +
 src/GUI/WindowsMouseCursor.cxx                     |  116 ++
 .../WindowsMouseCursor.hxx}                        |   39 +-
 src/GUI/gui.cxx                                    |   11 +-
 src/GUI/gui_funcs.cxx                              |    6 +-
 src/GUI/new_gui.cxx                                |   12 +-
 src/Input/CMakeLists.txt                           |   42 +-
 src/Input/FGEventInput.cxx                         |    1 +
 src/Input/FGJoystickInput.cxx                      |    6 +-
 src/Input/FGKeyboardInput.cxx                      |    2 +-
 src/Input/FGLinuxEventInput.cxx                    |    6 +-
 src/Input/FGMacOSXEventInput.cxx                   |    2 +-
 src/Input/FGMacOSXEventInput.hxx                   |    1 -
 src/Input/FGMouseInput.cxx                         |  670 ++++++++---
 src/Input/FGMouseInput.hxx                         |   96 +-
 src/Instrumentation/CMakeLists.txt                 |    2 -
 src/Instrumentation/HUD/HUD_private.hxx            |    3 -
 src/Instrumentation/KLN89/kln89.cxx                |    4 +-
 src/Instrumentation/KLN89/kln89_page.cxx           |    2 +
 src/Instrumentation/KLN89/kln89_page_alt.cxx       |    2 +
 src/Instrumentation/KLN89/kln89_page_apt.cxx       |    3 +-
 src/Instrumentation/KLN89/kln89_page_cal.cxx       |    1 +
 src/Instrumentation/KLN89/kln89_page_cal.hxx       |    2 +-
 src/Instrumentation/KLN89/kln89_page_int.cxx       |    2 +
 src/Instrumentation/KLN89/kln89_page_nav.cxx       |    1 +
 src/Instrumentation/KLN89/kln89_page_ndb.cxx       |    2 +
 src/Instrumentation/KLN89/kln89_page_oth.cxx       |    2 +
 src/Instrumentation/KLN89/kln89_page_vor.cxx       |    2 +
 src/Instrumentation/airspeed_indicator.cxx         |   74 +-
 src/Instrumentation/airspeed_indicator.hxx         |   12 +-
 src/Instrumentation/altimeter.cxx                  |   44 +-
 src/Instrumentation/altimeter.hxx                  |   12 +-
 src/Instrumentation/clock.cxx                      |    2 +
 src/Instrumentation/dclgps.cxx                     |    6 +-
 src/Instrumentation/gps.cxx                        | 1158 ++++++++------------
 src/Instrumentation/gps.hxx                        |  147 ++-
 src/Instrumentation/instrument_mgr.cxx             |   30 +-
 src/Instrumentation/kt_70.cxx                      |  227 ----
 src/Instrumentation/kt_70.hxx                      |  124 ---
 src/Instrumentation/mk_viii.cxx                    |  379 ++-----
 src/Instrumentation/mk_viii.hxx                    |   33 +-
 src/Instrumentation/navradio.cxx                   |    6 +-
 src/Instrumentation/navradio.hxx                   |    8 +-
 src/Instrumentation/newnavradio.cxx                |   13 +-
 src/Instrumentation/rad_alt.cxx                    |  227 ++--
 src/Instrumentation/rad_alt.hxx                    |   34 +-
 src/Instrumentation/slip_skid_ball.hxx             |    3 -
 src/Instrumentation/tacan.hxx                      |    2 -
 src/Instrumentation/tcas.cxx                       |   14 +-
 src/Instrumentation/tcas.hxx                       |   18 +-
 src/Instrumentation/transponder.cxx                |  289 ++++-
 src/Instrumentation/transponder.hxx                |   75 +-
 src/Instrumentation/vertical_speed_indicator.cxx   |   90 +-
 src/Instrumentation/vertical_speed_indicator.hxx   |   15 +-
 src/Main/CMakeLists.txt                            |   21 +-
 src/Main/FGInterpolator.cxx                        |   15 +
 src/Main/FGInterpolator.hxx                        |   21 +
 src/Main/bootstrap.cxx                             |   24 +-
 src/Main/fg_commands.cxx                           |  173 +--
 src/Main/fg_init.cxx                               |   77 +-
 src/Main/fg_init.hxx                               |    7 +-
 src/Main/fg_os.hxx                                 |    2 +-
 src/Main/fg_props.cxx                              |   24 +-
 src/Main/globals.cxx                               |   23 +-
 src/Main/locale.cxx                                |   85 +-
 src/Main/locale.hxx                                |   10 +-
 src/Main/main.cxx                                  |   38 +-
 src/Main/main.hxx                                  |    1 -
 src/Main/metar_main.cxx                            |    1 +
 src/Main/options.cxx                               |   44 +-
 src/Main/positioninit.cxx                          |   23 +-
 src/Main/subsystemFactory.cxx                      |    4 +-
 src/Main/util.cxx                                  |   53 -
 src/Main/util.hxx                                  |   10 -
 src/Model/acmodel.cxx                              |    4 +-
 src/Model/panelnode.cxx                            |   68 +-
 src/MultiPlayer/multiplaymgr.cxx                   |    6 +
 src/Navaids/CMakeLists.txt                         |    6 +-
 src/Navaids/FlightPlan.cxx                         |   61 +-
 src/Navaids/FlightPlan.hxx                         |   14 +-
 src/Navaids/LevelDXML.cxx                          |    2 +-
 src/Navaids/NavDataCache.cxx                       |  161 ++-
 src/Navaids/NavDataCache.hxx                       |   27 +-
 src/Navaids/PolyLine.cxx                           |  161 +++
 src/Navaids/PolyLine.hxx                           |  115 ++
 src/Navaids/PositionedOctree.cxx                   |   38 +-
 src/Navaids/PositionedOctree.hxx                   |   27 +-
 src/Navaids/awynet.cxx                             |    4 +-
 src/Navaids/markerbeacon.cxx                       |    9 +
 src/Navaids/markerbeacon.hxx                       |    4 +-
 src/{Main/main.hxx => Navaids/navaids_fwd.hxx}     |   21 +-
 src/Navaids/navdb.cxx                              |   51 +-
 src/Navaids/navlist.cxx                            |   41 +-
 src/Navaids/navlist.hxx                            |   25 +-
 src/Navaids/navrecord.cxx                          |   18 +-
 src/Navaids/navrecord.hxx                          |   13 +-
 src/Navaids/poidb.cxx                              |  106 ++
 src/{Main/main.hxx => Navaids/poidb.hxx}           |   31 +-
 src/Navaids/positioned.cxx                         |   96 +-
 src/Navaids/positioned.hxx                         |   75 +-
 src/Navaids/procedure.cxx                          |    1 +
 src/Navaids/procedure.hxx                          |    5 +-
 src/Navaids/route.cxx                              |    2 +-
 src/Navaids/waypoint.cxx                           |    5 +-
 src/Navaids/waypoint.hxx                           |    5 +-
 src/Network/ATC-Inputs.cxx                         |    1 +
 src/Network/ATC-Main.cxx                           |    1 +
 src/Network/ATC-Main.hxx                           |    2 -
 src/Network/ATC-Outputs.cxx                        |    1 +
 src/Network/ATC-Outputs.hxx                        |    1 -
 src/Network/AV400.cxx                              |    1 +
 src/Network/AV400Sim.cxx                           |    1 +
 src/Network/AV400WSim.cxx                          |    3 +-
 src/Network/AV400WSim.hxx                          |    1 -
 src/Network/atlas.cxx                              |    1 +
 src/Network/garmin.cxx                             |    1 +
 src/Network/generic.cxx                            |   25 +-
 src/Network/httpd.cxx                              |   15 +-
 src/Network/joyclient.hxx                          |    1 -
 src/Network/jpg-httpd.cxx                          |   10 +-
 src/Network/jsclient.hxx                           |    1 -
 src/Network/lfsglass.hxx                           |    1 -
 src/Network/native.hxx                             |    1 -
 src/Network/native_ctrls.hxx                       |    2 -
 src/Network/native_fdm.hxx                         |    1 -
 src/Network/native_gui.hxx                         |    1 -
 src/Network/nmea.cxx                               |    1 +
 src/Network/props.cxx                              |    5 +-
 src/Network/props.hxx                              |    2 +-
 src/Scenery/scenery.cxx                            |   11 +-
 src/Scenery/tilemgr.cxx                            |    6 +
 src/Scripting/CMakeLists.txt                       |    6 +
 src/Scripting/ClipboardCocoa.mm                    |   24 +-
 src/Scripting/NasalCanvas.cxx                      |   80 +-
 src/Scripting/NasalModelData.cxx                   |  207 ++++
 src/Scripting/NasalModelData.hxx                   |   99 ++
 src/Scripting/NasalPositioned.cxx                  |  204 ++--
 src/Scripting/NasalPositioned.hxx                  |    1 +
 src/Scripting/NasalPositioned_cppbind.cxx          |  520 +++++++++
 src/Scripting/NasalString.cxx                      |  146 +++
 src/{Main/main.hxx => Scripting/NasalString.hxx}   |   18 +-
 src/Scripting/NasalSys.cxx                         |  396 +++++--
 src/Scripting/NasalSys.hxx                         |  155 +--
 src/Scripting/NasalSys_private.hxx                 |   71 ++
 src/Scripting/nasal-props.cxx                      |  320 ++++--
 src/Systems/pitot.cxx                              |   35 +-
 src/Systems/pitot.hxx                              |   12 +-
 src/Systems/system_mgr.cxx                         |   30 +-
 src/Systems/system_mgr.hxx                         |    3 -
 src/Time/TimeManager.cxx                           |    2 +-
 src/Time/light.cxx                                 |   15 +-
 src/Traffic/SchedFlight.cxx                        |    2 +-
 src/Traffic/Schedule.cxx                           |    2 +-
 src/Traffic/Schedule.hxx                           |    4 +-
 src/Traffic/TrafficMgr.cxx                         |    3 +-
 src/Traffic/TrafficMgr.hxx                         |    2 +-
 src/Viewer/CameraGroup.cxx                         |   39 +-
 src/Viewer/CameraGroup.hxx                         |    7 +-
 src/Viewer/FGEventHandler.cxx                      |   19 +-
 src/Viewer/fg_os_osgviewer.cxx                     |   38 +-
 src/Viewer/fgviewer.cxx                            |    3 +-
 src/Viewer/renderer.cxx                            |   92 +-
 src/Viewer/renderer.hxx                            |    3 +-
 src/Viewer/renderingpipeline.cxx                   |    4 +-
 src/Viewer/splash.cxx                              |    5 +-
 src/Viewer/viewmgr.cxx                             |   11 +-
 utils/CMakeLists.txt                               |   37 +-
 utils/GPSsmooth/UGear_telnet.cxx                   |    8 +-
 utils/GPSsmooth/UGear_telnet.hxx                   |    2 +-
 utils/TerraSync/terrasync.cxx                      |    9 +-
 utils/fgai/fgai.cxx                                |    7 +-
 utils/fgviewer/CMakeLists.txt                      |    2 +-
 utils/fgviewer/fgviewer.cxx                        |    4 +-
 version                                            |    2 +-
 405 files changed, 16137 insertions(+), 7007 deletions(-)

diff --cc src/AIModel/AIFlightPlanCreateCruise.cxx
index 15c3d64,709378f..709378f
mode 100755,100644..100755
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
diff --cc src/AIModel/AIMultiplayer.cxx
index 0c9bd97,2b9c09c..2b9c09c
mode 100755,100644..100755
--- a/src/AIModel/AIMultiplayer.cxx
+++ b/src/AIModel/AIMultiplayer.cxx
diff --cc src/FDM/JSBSim/input_output/FGPropertyManager.cpp
index 6d90792,aed2f32..aed2f32
mode 100755,100644..100755
--- a/src/FDM/JSBSim/input_output/FGPropertyManager.cpp
+++ b/src/FDM/JSBSim/input_output/FGPropertyManager.cpp
diff --cc src/FDM/JSBSim/input_output/FGXMLElement.cpp
index 96a03d7,45132a2..45132a2
mode 100755,100644..100755
--- a/src/FDM/JSBSim/input_output/FGXMLElement.cpp
+++ b/src/FDM/JSBSim/input_output/FGXMLElement.cpp
diff --cc src/FDM/JSBSim/input_output/FGXMLElement.h
index 21af972,f8b89c8..f8b89c8
mode 100755,100644..100755
--- a/src/FDM/JSBSim/input_output/FGXMLElement.h
+++ b/src/FDM/JSBSim/input_output/FGXMLElement.h
diff --cc src/FDM/JSBSim/input_output/FGXMLFileRead.h
index d7366db,09c889d..09c889d
mode 100755,100644..100755
--- a/src/FDM/JSBSim/input_output/FGXMLFileRead.h
+++ b/src/FDM/JSBSim/input_output/FGXMLFileRead.h
diff --cc src/FDM/JSBSim/math/FGFunction.cpp
index 38322bd,c64de4b..c64de4b
mode 100755,100644..100755
--- a/src/FDM/JSBSim/math/FGFunction.cpp
+++ b/src/FDM/JSBSim/math/FGFunction.cpp
diff --cc src/FDM/JSBSim/math/FGFunction.h
index f3277eb,43fe421..43fe421
mode 100755,100644..100755
--- a/src/FDM/JSBSim/math/FGFunction.h
+++ b/src/FDM/JSBSim/math/FGFunction.h
diff --cc src/FDM/JSBSim/math/FGPropertyValue.cpp
index 7f448da,1407a0c..1407a0c
mode 100755,100644..100755
--- a/src/FDM/JSBSim/math/FGPropertyValue.cpp
+++ b/src/FDM/JSBSim/math/FGPropertyValue.cpp
diff --cc src/FDM/JSBSim/math/FGPropertyValue.h
index c716cf5,4ea0e53..4ea0e53
mode 100755,100644..100755
--- a/src/FDM/JSBSim/math/FGPropertyValue.h
+++ b/src/FDM/JSBSim/math/FGPropertyValue.h
diff --cc src/FDM/JSBSim/models/FGInput.cpp
index 6e88485,d10ceac..d10ceac
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/FGInput.cpp
+++ b/src/FDM/JSBSim/models/FGInput.cpp
diff --cc src/FDM/JSBSim/models/FGInput.h
index 68f0e0c,2421cda..2421cda
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/FGInput.h
+++ b/src/FDM/JSBSim/models/FGInput.h
diff --cc src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp
index 028509d,9f321a2..9f321a2
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGActuator.cpp
index 8f65597,a335689..a335689
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGActuator.h
index 522fab8,a8e8d59..a8e8d59
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGActuator.h
+++ b/src/FDM/JSBSim/models/flight_control/FGActuator.h
diff --cc src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp
index a9143f4,28032d3..28032d3
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGGyro.cpp
index 7ee6abe,19d8de2..19d8de2
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGGyro.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGGyro.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp
index 3c04e68,e0a54a7..e0a54a7
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGPID.cpp
index c541a5c,95efe60..95efe60
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGPID.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGPID.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGPID.h
index 74d9aea,6069d3b..6069d3b
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGPID.h
+++ b/src/FDM/JSBSim/models/flight_control/FGPID.h
diff --cc src/FDM/JSBSim/models/flight_control/FGSensor.cpp
index bccf518,9aedc65..9aedc65
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGSensor.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGSensor.cpp
diff --cc src/FDM/JSBSim/models/flight_control/FGSensor.h
index 09b0376,be0eea2..be0eea2
mode 100755,100644..100755
--- a/src/FDM/JSBSim/models/flight_control/FGSensor.h
+++ b/src/FDM/JSBSim/models/flight_control/FGSensor.h
diff --cc src/Instrumentation/mk_viii.cxx
index 9b0ee2b,c1da1dd..c1da1dd
mode 100755,100644..100755
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
diff --cc src/Instrumentation/mk_viii.hxx
index 25b50c3,6529fba..6529fba
mode 100755,100644..100755
--- a/src/Instrumentation/mk_viii.hxx
+++ b/src/Instrumentation/mk_viii.hxx
diff --cc src/Instrumentation/tacan.hxx
index 48ca925,5a38376..5a38376
mode 100755,100644..100755
--- a/src/Instrumentation/tacan.hxx
+++ b/src/Instrumentation/tacan.hxx

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear.git



More information about the pkg-fgfs-crew mailing list