[pkg-fgfs-crew] [simgear] 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 simgear.

commit 7ed4b7bab657ace81e29fb68e7b3a3a3846798f7
Merge: f94dbae 290dc05
Author: Markus Wanner <markus at bluegap.ch>
Date:   Tue Jan 21 21:11:55 2014 +0100

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

 simgear/io/sg_binobj.cxx                         | 41 ++++++++++++------------
 simgear/misc/sg_dir.cxx                          |  6 +++-
 simgear/nasal/code.c                             |  6 ++--
 simgear/nasal/codegen.c                          | 15 ++++++++-
 simgear/nasal/cppbind/Ghost.hxx                  | 23 ++++++++++---
 simgear/nasal/cppbind/detail/to_nasal_helper.cxx | 16 ++++++++-
 simgear/props/props.hxx                          |  7 ++++
 simgear/scene/tgdb/SGReaderWriterBTG.cxx         | 16 ++++++---
 version                                          |  2 +-
 9 files changed, 97 insertions(+), 35 deletions(-)

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