• DonLakeFlyer's avatar
    · 7110f28c
    DonLakeFlyer authored
    Merge conflict fixes
    7110f28c
Name
Last commit
Last update
..
QGroundControl Loading commit data...
APMSubMotorDisplay.qml Loading commit data...
AppMessages.cc Loading commit data...
AppMessages.h Loading commit data...
AppMessages.qml Loading commit data...
AxisMonitor.qml Loading commit data...
CMakeLists.txt Loading commit data...
ClickableColor.qml Loading commit data...
CoordinateVector.cc Loading commit data...
CoordinateVector.h Loading commit data...
DeadMouseArea.qml Loading commit data...
DropButton.qml Loading commit data...
DropPanel.qml Loading commit data...
EditPositionDialog.FactMetaData.json Loading commit data...
EditPositionDialog.qml Loading commit data...
EditPositionDialogController.cc Loading commit data...
EditPositionDialogController.h Loading commit data...
ExclusiveGroupItem.qml Loading commit data...
FactSliderPanel.qml Loading commit data...
FileButton.qml Loading commit data...
FlightModeDropdown.qml Loading commit data...
FlightModeMenu.qml Loading commit data...
HackAndroidFileDialog.qml Loading commit data...
HackFileDialog.qml Loading commit data...
HeightIndicator.qml Loading commit data...
IndicatorButton.qml Loading commit data...
JoystickThumbPad.qml Loading commit data...
KMLOrSHPFileDialog.qml Loading commit data...
LogReplayStatusBar.qml Loading commit data...
MAVLinkMessageButton.qml Loading commit data...
MainWindowSavedState.qml Loading commit data...
MissionCommandDialog.qml Loading commit data...
MissionItemIndexLabel.qml Loading commit data...
ModeSwitchDisplay.qml Loading commit data...
MultiRotorMotorDisplay.qml Loading commit data...
OfflineMapButton.qml Loading commit data...
PIDTuning.qml Loading commit data...
PageView.qml Loading commit data...
ParameterEditor.qml Loading commit data...
ParameterEditorController.cc Loading commit data...
ParameterEditorController.h Loading commit data...
ParameterEditorDialog.qml Loading commit data...
PreFlightCheckButton.qml Loading commit data...
PreFlightCheckGroup.qml Loading commit data...
PreFlightCheckList.qml Loading commit data...
PreFlightCheckModel.qml Loading commit data...
QGCButton.qml Loading commit data...
QGCCheckBox.qml Loading commit data...
QGCColoredImage.qml Loading commit data...
QGCComboBox.qml Loading commit data...
QGCDynamicObjectManager.qml Loading commit data...
QGCFileDialog.qml Loading commit data...
QGCFileDialogController.cc Loading commit data...
QGCFileDialogController.h Loading commit data...
QGCFlickable.qml Loading commit data...
QGCFlickableHorizontalIndicator.qml Loading commit data...
QGCFlickableVerticalIndicator.qml Loading commit data...
QGCGeoBoundingCube.cc Loading commit data...
QGCGeoBoundingCube.h Loading commit data...
QGCGroupBox.qml Loading commit data...
QGCHoverButton.qml Loading commit data...
QGCImageProvider.cc Loading commit data...
QGCImageProvider.h Loading commit data...
QGCLabel.qml Loading commit data...
QGCListView.qml Loading commit data...
QGCMapLabel.qml Loading commit data...
QGCMenu.qml Loading commit data...
QGCMenuItem.qml Loading commit data...
QGCMenuSeparator.qml Loading commit data...
QGCMouseArea.qml Loading commit data...
QGCMovableItem.qml Loading commit data...
QGCOptionsComboBox.qml Loading commit data...
QGCPipable.qml Loading commit data...
QGCRadioButton.qml Loading commit data...
QGCSlider.qml Loading commit data...
QGCSwitch.qml Loading commit data...
QGCTabBar.qml Loading commit data...
QGCTabButton.qml Loading commit data...
QGCTextField.qml Loading commit data...
QGCToolBarButton.qml Loading commit data...
QGCViewDialog.qml Loading commit data...
QGCViewDialogContainer.qml Loading commit data...
QGCViewMessage.qml 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...
RCChannelMonitor.qml Loading commit data...
RCChannelMonitorController.cc Loading commit data...
RCChannelMonitorController.h Loading commit data...
RoundButton.qml Loading commit data...
ScreenTools.qml Loading commit data...
ScreenToolsController.cc Loading commit data...
ScreenToolsController.h Loading commit data...
SectionHeader.qml Loading commit data...
SliderSwitch.qml Loading commit data...
SubMenuButton.qml Loading commit data...
ToolStrip.qml Loading commit data...
VehicleRotationCal.qml Loading commit data...
VehicleSummaryRow.qml Loading commit data...
arrow-down.png Loading commit data...
checkbox-check.svg Loading commit data...