Merge branch 'dev-win' into dev-winXbee
Conflicts: qgroundcontrol.pri
Showing
- qgroundcontrol.pri 2 additions, 2 deletionsqgroundcontrol.pri
- src/ui/QGCParamWidget.cc 1 addition, 1 deletionsrc/ui/QGCParamWidget.cc
- src/ui/map/Waypoint2DIcon.cc 2 additions, 0 deletionssrc/ui/map/Waypoint2DIcon.cc
- thirdParty/mavlink/include/ardupilotmega/ardupilotmega.h 9 additions, 2 deletionsthirdParty/mavlink/include/ardupilotmega/ardupilotmega.h
- thirdParty/mavlink/include/ardupilotmega/mavlink.h 1 addition, 1 deletionthirdParty/mavlink/include/ardupilotmega/mavlink.h
- thirdParty/mavlink/include/common/common.h 58 additions, 41 deletionsthirdParty/mavlink/include/common/common.h
- thirdParty/mavlink/include/common/mavlink.h 1 addition, 1 deletionthirdParty/mavlink/include/common/mavlink.h
- thirdParty/mavlink/include/mavlink_types.h 27 additions, 4 deletionsthirdParty/mavlink/include/mavlink_types.h
- thirdParty/mavlink/include/minimal/mavlink.h 11 additions, 0 deletionsthirdParty/mavlink/include/minimal/mavlink.h
- thirdParty/mavlink/include/minimal/mavlink_msg_heartbeat.h 132 additions, 0 deletionsthirdParty/mavlink/include/minimal/mavlink_msg_heartbeat.h
- thirdParty/mavlink/include/minimal/minimal.h 45 additions, 0 deletionsthirdParty/mavlink/include/minimal/minimal.h
- thirdParty/mavlink/include/pixhawk/mavlink.h 1 addition, 1 deletionthirdParty/mavlink/include/pixhawk/mavlink.h
- thirdParty/mavlink/include/pixhawk/mavlink_msg_image_available.h 71 additions, 5 deletions...rty/mavlink/include/pixhawk/mavlink_msg_image_available.h
- thirdParty/mavlink/include/pixhawk/mavlink_msg_image_triggered.h 71 additions, 5 deletions...rty/mavlink/include/pixhawk/mavlink_msg_image_triggered.h
- thirdParty/mavlink/include/pixhawk/mavlink_msg_vision_speed_estimate.h 176 additions, 0 deletions...vlink/include/pixhawk/mavlink_msg_vision_speed_estimate.h
- thirdParty/mavlink/include/pixhawk/pixhawk.h 11 additions, 12 deletionsthirdParty/mavlink/include/pixhawk/pixhawk.h
- thirdParty/mavlink/include/slugs/mavlink.h 1 addition, 1 deletionthirdParty/mavlink/include/slugs/mavlink.h
- thirdParty/mavlink/include/slugs/slugs.h 9 additions, 2 deletionsthirdParty/mavlink/include/slugs/slugs.h
- thirdParty/mavlink/include/ualberta/mavlink.h 1 addition, 1 deletionthirdParty/mavlink/include/ualberta/mavlink.h
- thirdParty/mavlink/include/ualberta/mavlink_msg_radio_calibration.h 52 additions, 52 deletions.../mavlink/include/ualberta/mavlink_msg_radio_calibration.h
Loading
Please register or sign in to comment