qgroundcontrol.qrc · f1aa7947a39e1a3d847059a259c6737139ae4329 · Valentin Platzgummer / qgroundcontrol

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into foo · b3807a9f

Gus Grubba authored Apr 30, 2019

# Conflicts:
#	src/AutoPilotPlugins/APM/APMAirframeComponent.qml
#	src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
#	src/AutoPilotPlugins/APM/APMLightsComponent.qml

b3807a9f

qgroundcontrol.qrc 25.3 KB

Replace qgroundcontrol.qrc