* MavLink/master: Fix MultiTouch Conflicts: src/QmlControls/JoystickThumbPad.qml
Attach a file by drag & drop or click to upload
