• dogmaphobic's avatar
    Merge remote-tracking branch 'origin/master' into buildWork · 8ba44b79
    dogmaphobic authored
    * origin/master:
      Fix compiler warnings
      MockLink Start/Stop to Preferences
      Use vehicle count instead of link count
      Fix compiler warning
      Centralize unit test declaration location
      Add --unittest-stress support
    
    Conflicts:
    	QGCApplication.pro
    8ba44b79
Name
Last commit
Last update
..
linechart Loading commit data...
preferences Loading commit data...
toolbar Loading commit data...
uas Loading commit data...
HILDockWidget.cc Loading commit data...
HILDockWidget.h Loading commit data...
InputConfiguration.cc Loading commit data...
Linechart.ui Loading commit data...
LogReplayLinkConfigurationWidget.cc Loading commit data...
LogReplayLinkConfigurationWidget.h Loading commit data...
LogReplayLinkConfigurationWidget.ui Loading commit data...
MAVLinkDecoder.cc Loading commit data...
MAVLinkDecoder.h Loading commit data...
MAVLinkSettingsWidget.cc Loading commit data...
MAVLinkSettingsWidget.h Loading commit data...
MAVLinkSettingsWidget.ui Loading commit data...
MainWindow.cc Loading commit data...
MainWindow.h Loading commit data...
MainWindow.qml Loading commit data...
MainWindow.ui Loading commit data...
MainWindowLeftPanel.qml Loading commit data...
MockLinkConfiguration.cc Loading commit data...
MockLinkConfiguration.h Loading commit data...
MockLinkConfiguration.ui Loading commit data...
MultiVehicleDockWidget.cc Loading commit data...
MultiVehicleDockWidget.h Loading commit data...
MultiVehicleDockWidget.ui Loading commit data...
QGCCommConfiguration.cc Loading commit data...
QGCCommConfiguration.h Loading commit data...
QGCCommConfiguration.ui Loading commit data...
QGCDataPlot2D.cc Loading commit data...
QGCDataPlot2D.h Loading commit data...
QGCDataPlot2D.ui Loading commit data...
QGCHilConfiguration.cc Loading commit data...
QGCHilConfiguration.h Loading commit data...
QGCHilConfiguration.ui Loading commit data...
QGCHilFlightGearConfiguration.cc Loading commit data...
QGCHilFlightGearConfiguration.h Loading commit data...
QGCHilFlightGearConfiguration.ui Loading commit data...
QGCHilJSBSimConfiguration.cc Loading commit data...
QGCHilJSBSimConfiguration.h Loading commit data...
QGCHilJSBSimConfiguration.ui Loading commit data...
QGCHilXPlaneConfiguration.cc Loading commit data...
QGCHilXPlaneConfiguration.h Loading commit data...
QGCHilXPlaneConfiguration.ui Loading commit data...
QGCLinkConfiguration.cc Loading commit data...
QGCLinkConfiguration.h Loading commit data...
QGCLinkConfiguration.ui Loading commit data...
QGCMAVLinkInspector.cc Loading commit data...
QGCMAVLinkInspector.h Loading commit data...
QGCMAVLinkInspector.ui Loading commit data...
QGCMAVLinkLogPlayer.cc Loading commit data...
QGCMAVLinkLogPlayer.h Loading commit data...
QGCMAVLinkLogPlayer.ui Loading commit data...
QGCMapRCToParamDialog.cpp Loading commit data...
QGCMapRCToParamDialog.h Loading commit data...
QGCMapRCToParamDialog.ui Loading commit data...
QGCPluginHost.cc Loading commit data...
QGCPluginHost.h Loading commit data...
QGCPluginHost.ui Loading commit data...
QGCTCPLinkConfiguration.cc Loading commit data...
QGCTCPLinkConfiguration.h Loading commit data...
QGCTCPLinkConfiguration.ui Loading commit data...
QGCTabbedInfoView.cpp Loading commit data...
QGCTabbedInfoView.h Loading commit data...
QGCTabbedInfoView.ui Loading commit data...
QGCUASFileView.cc Loading commit data...
QGCUASFileView.h Loading commit data...
QGCUASFileView.ui Loading commit data...
QGCUASFileViewMulti.cc Loading commit data...
QGCUASFileViewMulti.h Loading commit data...
QGCUASFileViewMulti.ui Loading commit data...
QGCUDPLinkConfiguration.cc Loading commit data...
QGCUDPLinkConfiguration.h Loading commit data...
QGCUDPLinkConfiguration.ui Loading commit data...
QGCWebView.cc Loading commit data...
QGCWebView.h Loading commit data...
QGCWebView.ui Loading commit data...
QMap3D.ui Loading commit data...
SerialConfigurationWindow.cc Loading commit data...
SerialConfigurationWindow.h Loading commit data...
SerialSettings.ui Loading commit data...
SettingsDialog.cc Loading commit data...
SettingsDialog.h Loading commit data...
SettingsDialog.ui Loading commit data...
UASInfo.ui Loading commit data...
XbeeConfigurationWindow.cpp Loading commit data...
XbeeConfigurationWindow.h Loading commit data...