src/FlightDisplay/VirtualJoystick.qml · 4729b98ce4163b7425044207c04ab2af505b18b7 · Valentin Platzgummer / qgroundcontrol · GitLab

"src/FlightDisplay/GuidedActionLand.qml" did not exist on "062fddaf25eb6ba67534d424067951c2214f9ed6"

May 15, 2019
ca8ee3ad
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into qgc4 · ca8ee3ad
Gus Grubba authored May 15, 2019
```
# Conflicts:
#	src/FlightDisplay/VirtualJoystick.qml
#	src/ui/preferences/GeneralSettings.qml
```
ca8ee3ad
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into qgc4
Gus Grubba authored May 15, 2019
```
# Conflicts:
#	src/FlightDisplay/VirtualJoystick.qml
#	src/ui/preferences/GeneralSettings.qml
```