qgroundcontrol.qrc · f9e75ce8897b5514c4aefdb5840a0943ca2585fd · Valentin Platzgummer / qgroundcontrol · GitLab

Apr 28, 2019
a3b3e582
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into foo · a3b3e582
Gus Grubba authored Apr 28, 2019
```
# Conflicts:
#	src/FlightDisplay/GuidedActionsController.qml
#	src/PlanView/PlanView.qml
```
a3b3e582
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into foo
Gus Grubba authored Apr 28, 2019
```
# Conflicts:
#	src/FlightDisplay/GuidedActionsController.qml
#	src/PlanView/PlanView.qml
```