src/FlightDisplay/FlightDisplayViewWidgets.qml · f58ce6e3cbfbc7b08e04474299a6133a2f8eb3c0 · Valentin Platzgummer / qgroundcontrol · GitLab

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
```