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

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

* MavLink/master:
  Update fact meta data for PX4
  Add missing header
  Fix binding
  Add mission header
  Add missing header
  ComplexMissionItem support for Survey
  Header re-structuring
  Raise min Qt version to 5.5+

Conflicts:
	src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
parents 03683ca1 e29dce3d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment