Skip to content
Snippets Groups Projects
Commit 303050ed authored by Don Gagne's avatar Don Gagne
Browse files

Merge branch 'FixSetupView' of https://github.com/DonLakeFlyer/qgroundcontrol into FixSetupView 

Conflicts:
	src/AutoPilotPlugins/PX4/AirframeComponent.cc
parents 0c1ca1ed 581a026f
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