mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-18 03:52:11 +01:00
76f45b5218
Conflicts: ground/openpilotgcs/src/plugins/config/airframe.ui ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp