[pkg-fgfs-crew] [simgear] 03/04: 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 simgear.

commit 07ab0a90e1b08a118ac3bf1f66cb8f8459e4de3f
Merge: 8bd4e56 383c2b1
Author: Markus Wanner <markus at bluegap.ch>
Date:   Thu Jan 23 19:37:43 2014 +0100

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

 simgear/scene/material/matlib.hxx            | 5 ++++-
 simgear/scene/tgdb/obj.cxx                   | 6 +++---
 simgear/scene/util/SGReaderWriterOptions.hxx | 8 +++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

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