src/Camera/QGCCameraManager.cc · 7eb9fbc65806149cdad50f4cde53f2368feb662f · Valentin Platzgummer / qgroundcontrol · GitLab

Blame History Permalink

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

QGCCameraManager.cc 15.9 KB