mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
Conflicts: ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui