Commit 79d78668 authored 13 years ago by oberion

Merge remote-tracking branch 'remotes/pixhawk/v10release' into dev_senseSoarMavlinkv10

Conflicts:
	qgroundcontrol.pro
	src/comm/SerialLink.cc
	src/uas/QGCMAVLinkUASFactory.cc
	src/ui/CommConfigurationWindow.cc
	src/ui/MainWindow.cc
	src/ui/MainWindow.h
	src/ui/QGCParamWidget.h
	thirdParty/mavlink/include/mavlink_types.h

parents 17eb2abd a81ecc23

Show whitespace changes

Inline Side-by-side

Showing with 50094 additions and 0 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 61+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment