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

Fixing merge conflicts. 

Merge remote-tracking branch 'mavlink/master' into toggleMapButtons

* mavlink/master:
  UAS: Improve HIL inputs
  More work on waypoint lines

Conflicts:
	src/MissionEditor/MissionEditor.qml
parents 81908093 2ba8a0f3
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