mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-19 04:52:12 +01:00
bdbbaa4f93
Conflicts: ground/openpilotgcs/src/libs/utils/logfile.cpp ground/openpilotgcs/src/libs/utils/logfile.h ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.h ground/openpilotgcs/src/plugins/telemetry/monitorwidget.h ground/openpilotgcs/src/plugins/telemetry/telemetry_global.h