src/Settings/AppSettings.cc · 9c47ceb46d614bc1380a706f2f3b9c827d79bfe1 · 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

AppSettings.cc 7.71 KB