Skip to content
Snippets Groups Projects
Commit 17641797 authored by dogmaphobic's avatar dogmaphobic
Browse files

Merge remote-tracking branch 'MavLink/master' 

* MavLink/master:
  Support V110 (APM) and V120 (PX4) formats
  Fit map viewport to mission items
  Add support for mission item insert
  Add support for mission item insert
  Warn about joystick on APM stack

Conflicts:
	src/FlightDisplay/FlightDisplayView.qml
parents a4c19e72 8890d874
No related branches found
No related tags found
No related merge requests found
Show 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