src/QmlControls/JoystickThumbPad.qml · d6b4f5c361583c1076f1901ebe51636429cda460 · Valentin Platzgummer / qgroundcontrol · GitLab

Nov 29, 2015
d5d42272
Merge remote-tracking branch 'MavLink/master' into thumbStick · d5d42272
dogmaphobic authored Nov 29, 2015
```
* MavLink/master:
  Fix MultiTouch

Conflicts:
	src/QmlControls/JoystickThumbPad.qml
```
d5d42272
Merge remote-tracking branch 'MavLink/master' into thumbStick
dogmaphobic authored Nov 29, 2015
```
* MavLink/master:
  Fix MultiTouch

Conflicts:
	src/QmlControls/JoystickThumbPad.qml
```