• 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
Name
Last commit
Last update
..
SDL_GameControllerDB Loading commit data...
audio Loading commit data...
calibration Loading commit data...
firmware Loading commit data...
flightgear Loading commit data...
fonts Loading commit data...
icons Loading commit data...
mavs Loading commit data...
opengl Loading commit data...
styles Loading commit data...
Antenna_RC.svg Loading commit data...
Antenna_T.svg Loading commit data...
ArrowDown.svg Loading commit data...
ArrowRight.svg Loading commit data...
CogWheels.png Loading commit data...
JoystickBezel.png Loading commit data...
JoystickBezelLight.png Loading commit data...
Pause.svg Loading commit data...
Play.svg Loading commit data...
PowerButton.svg Loading commit data...
QGCLogoBlack.svg Loading commit data...
QGCLogoFull.svg Loading commit data...
QGCLogoWhite.svg Loading commit data...
QGroundControlConnect.svg Loading commit data...
SplashScreen.png Loading commit data...
Stop.svg Loading commit data...
TrashDelete.svg Loading commit data...
XDelete.svg Loading commit data...
XDeleteBlack.svg Loading commit data...
action.svg Loading commit data...
buttonLeft.svg Loading commit data...
buttonRight.svg Loading commit data...
camera.svg Loading commit data...
cancel.svg Loading commit data...
check.svg Loading commit data...
gear-black.svg Loading commit data...
gear-white.svg Loading commit data...
land.svg Loading commit data...
notile.png Loading commit data...
pause-mission.svg Loading commit data...
rtl.svg Loading commit data...
takeoff.svg Loading commit data...
waves.svg Loading commit data...
waypoint.svg Loading commit data...
wind-guru.svg Loading commit data...
wind-rose-arrow.svg Loading commit data...
wind-rose.svg Loading commit data...
wind-roseBlack.svg Loading commit data...