Skip to content
Commit d5d42272 authored by dogmaphobic's avatar dogmaphobic
Browse files

Merge remote-tracking branch 'MavLink/master' into thumbStick 

* MavLink/master:
  Fix MultiTouch

Conflicts:
	src/QmlControls/JoystickThumbPad.qml
parents 402b380b 59df13a2
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment