qgroundcontrol.qrc · 5499e8c655d945553ea650fa7490a9b2b21e3bf9 · Valentin Platzgummer / qgroundcontrol · GitLab

May 14, 2019
7eb9fbc6
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into qgc4 · 7eb9fbc6
Gus Grubba authored May 14, 2019
```
# Conflicts:
#	qgroundcontrol.qrc
#	src/Microhard/MicrohardSettings.qml
#	src/VehicleSetup/FirmwareUpgrade.qml
```
7eb9fbc6
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into qgc4
Gus Grubba authored May 14, 2019
```
# Conflicts:
#	qgroundcontrol.qrc
#	src/Microhard/MicrohardSettings.qml
#	src/VehicleSetup/FirmwareUpgrade.qml
```