mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-31 16:52:10 +01:00
78a4241ba2
Conflicts: ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp ground/openpilotgcs/src/plugins/config/configinputwidget.cpp ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp