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
..
AutoPilotPlugins Loading commit data...
FactSystem Loading commit data...
FirmwarePlugin Loading commit data...
FlightDisplay Loading commit data...
FlightMap Loading commit data...
Joystick Loading commit data...
MissionEditor Loading commit data...
MissionManager Loading commit data...
QmlControls Loading commit data...
QtLocationPlugin Loading commit data...
Vehicle Loading commit data...
VehicleSetup Loading commit data...
VideoStreaming Loading commit data...
ViewWidgets Loading commit data...
apps/qgcvideo Loading commit data...
audio Loading commit data...
comm Loading commit data...
input Loading commit data...
qgcunittest Loading commit data...
uas Loading commit data...
ui Loading commit data...
CmdLineOptParser.cc Loading commit data...
CmdLineOptParser.h Loading commit data...
GAudioOutput.cc Loading commit data...
GAudioOutput.h Loading commit data...
HomePositionManager.cc Loading commit data...
HomePositionManager.h Loading commit data...
LogCompressor.cc Loading commit data...
LogCompressor.h Loading commit data...
MG.h Loading commit data...
MissionItem.cc Loading commit data...
MissionItem.h Loading commit data...
MissionItemTest.cc Loading commit data...
MissionItemTest.h Loading commit data...
QGC.cc Loading commit data...
QGC.h Loading commit data...
QGCApplication.cc Loading commit data...
QGCApplication.h Loading commit data...
QGCComboBox.cc Loading commit data...
QGCComboBox.h Loading commit data...
QGCConfig.h Loading commit data...
QGCDockWidget.cc Loading commit data...
QGCDockWidget.h Loading commit data...
QGCFileDialog.cc Loading commit data...
QGCFileDialog.h Loading commit data...
QGCGeo.h Loading commit data...
QGCLoggingCategory.cc Loading commit data...
QGCLoggingCategory.h Loading commit data...
QGCMessageBox.h Loading commit data...
QGCPalette.cc Loading commit data...
QGCPalette.h Loading commit data...
QGCQmlWidgetHolder.cpp Loading commit data...
QGCQmlWidgetHolder.h Loading commit data...
QGCQmlWidgetHolder.ui Loading commit data...
QGCQuickWidget.cc Loading commit data...
QGCQuickWidget.h Loading commit data...
QGCSingleton.cc Loading commit data...
QGCSingleton.h Loading commit data...
QGCTemporaryFile.cc Loading commit data...
QGCTemporaryFile.h Loading commit data...
SerialPortIds.h Loading commit data...
documentation.dox Loading commit data...
main.cc Loading commit data...
test.qml Loading commit data...