src/QmlControls/FactSliderPanel.qml · 114c300f147dd3c7de04b08141674c5c6d8227d6 · Valentin Platzgummer / qgroundcontrol · GitLab

May 07, 2019
81e44f00
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into foo · 81e44f00
Gus Grubba authored May 07, 2019
```
# Conflicts:
#	src/QmlControls/PIDTuning.qml
#	src/ui/MainWindow.cc
```
81e44f00
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into foo
Gus Grubba authored May 07, 2019
```
# Conflicts:
#	src/QmlControls/PIDTuning.qml
#	src/ui/MainWindow.cc
```