Skip to content
Snippets Groups Projects
Select Git revision
  • master default protected
  • dev1
  • merge_branch_alt
  • original
  • rc1
  • phil
6 results
Compare
user avatar
Merge branch 'dev-win' into dev-winXbee
oberion authored 
Conflicts:
	qgroundcontrol.pri
a0a42865
History
user avatar a0a42865
History
Name Last commit Last update
..
RadioCalibration
designer
generated
linechart
map
map3D
mission
uas
watchdog
AudioOutputWidget.cc
AudioOutputWidget.h
AudioOutputWidget.ui
CameraView.cc
CameraView.h
CommConfigurationWindow.cc
CommConfigurationWindow.h
CommSettings.ui
DebugConsole.cc
DebugConsole.h
DebugConsole.ui
HDDisplay.cc
HDDisplay.h
HDDisplay.ui
HSIDisplay.cc
HSIDisplay.h
HUD.cc
HUD.h
InputConfiguration.cc
JoystickWidget.cc
JoystickWidget.h
JoystickWidget.ui
Linechart.ui
MAVLinkSettingsWidget.cc
MAVLinkSettingsWidget.h
MAVLinkSettingsWidget.ui
MainWindow.cc
MainWindow.h
MainWindow.ui
MapWidget.cc
MapWidget.h
MapWidget.ui
ObjectDetectionView.cc
ObjectDetectionView.h
ObjectDetectionView.ui
OgreWidget.cc
OgreWidget.h
OpalLinkConfigurationWindow.cc
OpalLinkConfigurationWindow.h
OpalLinkSettings.ui
ParameterInterface.cc
ParameterInterface.h
ParameterInterface.ui
ParameterView.ui
QGCDataPlot2D.cc
QGCDataPlot2D.h
QGCDataPlot2D.ui
QGCFirmwareUpdate.cc
QGCFirmwareUpdate.h
QGCFirmwareUpdate.ui
QGCMAVLinkLogPlayer.cc
QGCMAVLinkLogPlayer.h
QGCMAVLinkLogPlayer.ui
QGCMainWindowAPConfigurator.cc
QGCMainWindowAPConfigurator.h
QGCParamWidget.cc
QGCParamWidget.h
QGCPxImuFirmwareUpdate.cc
QGCPxImuFirmwareUpdate.h
QGCPxImuFirmwareUpdate.ui
QGCRemoteControlView.cc
QGCRemoteControlView.h
QGCRemoteControlView.ui
QGCSensorSettingsWidget.cc
QGCSensorSettingsWidget.h
QGCSensorSettingsWidget.ui
QGCSettingsWidget.cc
QGCSettingsWidget.h
QGCSettingsWidget.ui
QGCToolBar.cc
QGCToolBar.h
QGCUDPLinkConfiguration.cc
QGCUDPLinkConfiguration.h
QGCUDPLinkConfiguration.ui
QGCWaypointListMulti.cc
QGCWaypointListMulti.h
QGCWaypointListMulti.ui
QGCWebView.cc
QGCWebView.h
QGCWebView.ui
QMap3D.ui
SerialConfigurationWindow.cc
SerialConfigurationWindow.h
SerialSettings.ui
SlugsDataSensorView.cc
SlugsDataSensorView.h
SlugsDataSensorView.ui
SlugsHilSim.cc
SlugsHilSim.h
SlugsHilSim.ui
SlugsPadCameraControl.cpp