• Gus Grubba's avatar
    Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap · 1d7cf605
    Gus Grubba authored
    # Conflicts:
    #	qgcresources.qrc
    #	src/FlightDisplay/FlightDisplayView.qml
    #	src/MissionManager/MissionController.cc
    #	src/MissionManager/SurveyMissionItem.cc
    #	src/MissionManager/SurveyMissionItem.h
    #	src/PlanView/PlanView.qml
    #	src/QGCApplication.cc
    #	src/Settings/AppSettings.h
    #	src/Vehicle/Vehicle.h
    
    Note that SurveyMissionItem (.h/.cc) was changed in such a way that all previous changes were lost. Dynamic computation of its bounding box is missing and needs to be added into whatever is now handling these.
    1d7cf605
qgcresources.qrc 27.1 KB