Merge branch 'simplexSplit' of github.com:openmav/jsbsim into simplexSplit

a4adf05f · James Goppert · 5787ade4 · e0971110 · a4adf05f · a4adf05f
Commit a4adf05f authored 14 years ago by James Goppert
--- a/gui/models/jet.jpg
+++ b/gui/models/jet.jpg
--- a/gui/models/plane.ac
+++ b/gui/models/plane.ac
--- a/gui/models/plane.blend
+++ b/gui/models/plane.blend
--- a/gui/models/plane.jpg
+++ b/gui/models/plane.jpg
--- a/gui/models/rcTruck.ac
+++ b/gui/models/rcTruck.ac
--- a/gui/models/rcTruck.blend
+++ b/gui/models/rcTruck.blend
--- a/gui/models/rcTruck.jpg
+++ b/gui/models/rcTruck.jpg
--- a/gui/osgUtils.cpp
+++ b/gui/osgUtils.cpp
--- a/gui/osgUtils.hpp
+++ b/gui/osgUtils.hpp
--- a/gui/qt_main.cpp
+++ b/gui/qt_main.cpp
--- a/gui/textures.qrc
+++ b/gui/textures.qrc