src/ui/preferences/GeneralSettings.qml · 04db295179b6d04a1279be0998061b6d2cb16066 · Valentin Platzgummer / qgroundcontrol · GitLab

Blame History Permalink

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

GeneralSettings.qml 56.9 KB