Skip to content
Commit 76cea4e1 authored by Bryant's avatar Bryant
Browse files

Merge branch 'integration_merge' of https://github.com/mavlink/qgroundcontrol into connStatus 

Conflicts:
	src/uas/ArduPilotMegaMAV.h
	src/ui/uas/UASListWidget.cc
parents 0e58853b 33c8f8c8
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