Skip to content
Commit e0b7d593 authored by Thomas Gubler's avatar Thomas Gubler
Browse files

Merge remote-tracking branch 'upstream/master' into mavlinksubmodule_joystickinput 

Conflicts:
	src/ui/designer/QGCCommandButton.cc
parents b4114123 7631d9c9
Expand all 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