mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-18 03:52:11 +01:00
6998c782db
Conflicts: ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp