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

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

* MavLink/master:
  Remove QGCMessageBox usage
  Change window close sequence to prompt user from Qml side
  Fix live values
  Clear unsent channels
  Live flight mode config

Conflicts:
	src/ui/MainWindow.h
parents d06bdf8e c990e079
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