src/QmlControls/QmlTest.qml · f6b6211e1e8191dcc484f98717fc1b653acb4f7e · Valentin Platzgummer / qgroundcontrol

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap · 15517ff3

Gus Grubba authored Mar 14, 2018

# Conflicts:
#	src/FlightDisplay/FlightDisplayViewWidgets.qml
#	src/PlanView/MissionItemEditor.qml
#	src/PlanView/RallyPointItemEditor.qml
#	src/QmlControls/QGCButton.qml
#	src/api/QGCOptions.h

15517ff3

QmlTest.qml 42.9 KB

Replace QmlTest.qml