src/VehicleSetup/JoystickConfig.qml · 9d255f45e1e199aba8624aa3af61ebb645c04e47 · 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

JoystickConfig.qml 40.5 KB