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

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
79d78668 · oberion · 17eb2abd · a81ecc23 · 79d78668 · 79d78668
Commit 79d78668 authored Nov 01, 2011 by oberion
--- a/thirdParty/mavlink/message_definitions/pixhawk.xml
+++ b/thirdParty/mavlink/message_definitions/pixhawk.xml
--- a/thirdParty/mavlink/message_definitions/test.xml
+++ b/thirdParty/mavlink/message_definitions/test.xml
--- a/thirdParty/mavlink/missionlib/mavlink_missionlib_data.h
+++ b/thirdParty/mavlink/missionlib/mavlink_missionlib_data.h
--- a/thirdParty/mavlink/missionlib/mavlink_parameters.c
+++ b/thirdParty/mavlink/missionlib/mavlink_parameters.c
--- a/thirdParty/mavlink/missionlib/mavlink_parameters.h
+++ b/thirdParty/mavlink/missionlib/mavlink_parameters.h
--- a/thirdParty/mavlink/missionlib/testing/main.c
+++ b/thirdParty/mavlink/missionlib/testing/main.c
--- a/thirdParty/mavlink/missionlib/testing/mavlink_missionlib_data.h
+++ b/thirdParty/mavlink/missionlib/testing/mavlink_missionlib_data.h
--- a/thirdParty/mavlink/missionlib/testing/udptest.xcodeproj/.gitignore
+++ b/thirdParty/mavlink/missionlib/testing/udptest.xcodeproj/.gitignore
--- a/thirdParty/mavlink/missionlib/testing/udptest.xcodeproj/project.pbxproj
+++ b/thirdParty/mavlink/missionlib/testing/udptest.xcodeproj/project.pbxproj
--- a/thirdParty/mavlink/missionlib/waypoints.c
+++ b/thirdParty/mavlink/missionlib/waypoints.c
--- a/thirdParty/mavlink/missionlib/waypoints.h
+++ b/thirdParty/mavlink/missionlib/waypoints.h