mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-04-08 00:53:48 +02:00
Conflicts: ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp