Browse Source

Merge remote-tracking branch 'origin/ControlReorg' into ControlReorg

Conflicts:
	src/FlightDisplay/FlightDisplayView.qml

QGC4.4

Don Gagne 10 years ago

parent

08a652257b cd7951b379

commit

4b65b5e054

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available