[pkg-fgfs-crew] [flightgear] 02/03: Merge branch 'upstream', i.e. sources for 2.12.1.

[Markus Wanner]

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 b32a9d907e3317ccb18c4786cb7b2c8423889f9b
Merge: b61547c a50db1e
Author: Markus Wanner <markus at bluegap.ch>
Date:   Tue Jan 21 22:28:49 2014 +0100

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

 src/Autopilot/route_mgr.cxx            | 4 ++++
 src/Instrumentation/HUD/HUD_ladder.cxx | 4 ++--
 src/Main/bootstrap.cxx                 | 7 +++++++
 src/Navaids/NavDataCache.cxx           | 4 ++++
 src/Scripting/NasalPositioned.cxx      | 6 +++++-
 src/Scripting/NasalSys.cxx             | 8 +++++---
 version                                | 2 +-
 7 files changed, 28 insertions(+), 7 deletions(-)

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