QGCSetup.pri · 512301be440859b89b66fdc38ecb9af3992e32d1 · Valentin Platzgummer / qgroundcontrol · GitLab

Jun 18, 2018
eeba312d
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap · eeba312d
Gus Grubba authored Jun 18, 2018
```
# Conflicts:
#	src/MissionManager/PlanMasterController.cc
```
eeba312d
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap
Gus Grubba authored Jun 18, 2018
```
# Conflicts:
#	src/MissionManager/PlanMasterController.cc
```