Skip to content

Q
qgroundcontrol
Switch branch/tag
History Find file
  • dogmaphobic's avatar
    Fixing merge conflicts. · ae152e73
    dogmaphobic authored 
    Merge remote-tracking branch 'mavlink/master' into toggleMapButtons

* mavlink/master:
  UAS: Improve HIL inputs
  More work on waypoint lines

Conflicts:
	src/MissionEditor/MissionEditor.qml
    ae152e73
Name
Last commit
 Last update
..
CoordinateVector.cc Loading commit data...
CoordinateVector.h Loading commit data...
DropButton.qml Loading commit data...
IndicatorButton.qml Loading commit data...
MavlinkQmlSingleton.h Loading commit data...
MissionItemEditor.qml Loading commit data...
MissionItemIndexLabel.qml Loading commit data...
MissionItemSummary.qml Loading commit data...
ModeSwitchDisplay.qml Loading commit data...
ParameterEditor.qml Loading commit data...
ParameterEditorController.cc Loading commit data...
ParameterEditorController.h Loading commit data...
ParameterEditorDialog.qml Loading commit data...
QGCButton.qml Loading commit data...
QGCCanvas.qml Loading commit data...
QGCCheckBox.qml Loading commit data...
QGCColoredImage.qml Loading commit data...
QGCComboBox.qml Loading commit data...
QGCLabel.qml Loading commit data...
QGCMovableItem.qml Loading commit data...
QGCQGeoCoordinate.cc Loading commit data...
QGCQGeoCoordinate.h Loading commit data...
QGCRadioButton.qml Loading commit data...
QGCTextField.qml Loading commit data...
QGCToolBarButton.qml Loading commit data...
QGCView.qml Loading commit data...
QGCViewDialog.qml Loading commit data...
QGCViewMessage.qml Loading commit data...
QGCViewPanel.qml Loading commit data...
QGroundControl.Controls.qmldir Loading commit data...
QGroundControl.ScreenTools.qmldir Loading commit data...
QGroundControlQmlGlobal.cc Loading commit data...
QGroundControlQmlGlobal.h Loading commit data...
QmlObjectListModel.cc Loading commit data...
QmlObjectListModel.h Loading commit data...
QmlTest.qml Loading commit data...
QmlTestWidget.cc Loading commit data...
QmlTestWidget.h Loading commit data...
RoundButton.qml Loading commit data...
ScreenTools.qml Loading commit data...
ScreenToolsController.cc Loading commit data...
ScreenToolsController.h Loading commit data...
ScreenToolsFontQuery.qml Loading commit data...
SubMenuButton.qml Loading commit data...
VehicleRotationCal.qml Loading commit data...
VehicleSummaryRow.qml Loading commit data...
arrow-down.png Loading commit data...