Merge branch 'v10release' of github.com:pixhawk/qgroundcontrol into v10release

c4d7d5af · LM · 35bbb3f9 · e013c9d2 · c4d7d5af · c4d7d5af
Commit c4d7d5af authored Dec 22, 2011 by LM
--- a/lib/mac64/lib/osgPlugins-3.0.1/osgdb_txf.so
+++ b/lib/mac64/lib/osgPlugins-3.0.1/osgdb_txf.so
--- a/lib/mac64/lib/osgPlugins-3.0.1/osgdb_txp.so
+++ b/lib/mac64/lib/osgPlugins-3.0.1/osgdb_txp.so
--- a/lib/mac64/lib/osgPlugins-3.0.1/osgdb_vtf.so
+++ b/lib/mac64/lib/osgPlugins-3.0.1/osgdb_vtf.so
--- a/lib/mac64/lib/osgPlugins-3.0.1/osgdb_x.so
+++ b/lib/mac64/lib/osgPlugins-3.0.1/osgdb_x.so
--- a/lib/mac64/lib/osgPlugins-3.0.1/osgdb_zip.so
+++ b/lib/mac64/lib/osgPlugins-3.0.1/osgdb_zip.so
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
--- a/src/configuration.h
+++ b/src/configuration.h
--- a/src/ui/map3D/Pixhawk3DWidget.cc
+++ b/src/ui/map3D/Pixhawk3DWidget.cc