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

..

gcs

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

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

uavobjgenerator

LP-183 generated UAV objects are now more Qt and Qml friendly

2015-12-02 08:52:37 +01:00

usagetracker/backend

GCS: Add backend for usagetracker.

2015-09-23 17:10:01 +02:00

.gitattributes

OP-910: fix line endings and whitespaces (didn't work on Linux)

2013-06-05 23:21:54 +03:00

ground.pro

LP-1 - Rebranding

2015-08-04 16:55:12 +02:00