mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-04-02 20:25:16 +02:00
Conflicts: ground/openpilotgcs/src/plugins/config/airframe.ui ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp