mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01: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