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

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

* MavLink/master:
  Sqlite for Linux
  Update fact meta data for PX4
  Get rid of View menu
  Flickable in Offline Maps Reorder of headers
  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/Vehicle/MultiVehicleManager.cc
parents bb398c45 b4f0cd66
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