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

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

* MavLink/master:
  More reliable radio flash
  Fix autoconnect/re-autoconnect, plus windows connect
  Don't show resource busy errors from auto connect attempt
  Don't pop modal dialog during boot sequence

Conflicts:
	src/comm/LinkManager.cc
parents a8dabf1f e6f5eb34
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