Philippe Renon f9694acfd1 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration ...

# Conflicts:
#	ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
#	ground/gcs/src/share/qml/pfd/Compass.qml
#	ground/gcs/src/share/qml/pfd/Info.qml
#	ground/gcs/src/share/qml/pfd/Panels.qml
#	ground/gcs/src/share/qml/pfd/VsiScale.qml
#	ground/gcs/src/share/qml/pfd/Warnings.qml

2015-12-08 01:22:12 +01:00

..

src

Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration

2015-12-08 01:22:12 +01:00

copydata.pro

Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration

2015-08-29 17:03:48 +02:00

gcs.pri

LP-29 compile with libc++ on osx to fix issues when linking with osg

2015-12-02 23:16:05 +01:00

gcs.pro

LP-1: moved openpilotgcs.pri to gcs.pri

2015-08-02 19:36:39 +01:00