src/Settings/AppSettings.cc · 85dc293700a5f4c4ddc3557d24a162b1bf107254 · 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
```