[pkg-fgfs-crew] [flightgear] 01/02: Merge branch 'upstream', i.e. sources of something pre 3.0.0.

[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 7477a697d841cc492374e18ce654cb33ef2873af
Merge: 1752c56 4b412f8
Author: Markus Wanner <markus at bluegap.ch>
Date:   Thu Jan 23 19:08:25 2014 +0100

    Merge branch 'upstream', i.e. sources of something pre 3.0.0.

 src/GUI/MessageBox.cxx      |  6 +++++-
 src/Main/bootstrap.cxx      | 11 ++++++++++-
 src/Main/fg_commands.cxx    | 34 +++++++++++++++++++---------------
 src/Main/globals.cxx        |  3 ---
 src/Main/globals.hxx        |  2 +-
 src/Main/main.cxx           | 12 ++++++++++--
 src/Scenery/tilemgr.cxx     | 12 +++++++++---
 src/Scenery/tilemgr.hxx     |  4 ++++
 utils/fgelev/fgelev.cxx     |  2 +-
 utils/fgviewer/fgviewer.cxx |  2 +-
 10 files changed, 60 insertions(+), 28 deletions(-)

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