mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-30 15:52:12 +01:00
8bb94e052b
Conflicts: ground/openpilotgcs/src/plugins/config/camerastabilization.ui ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.h ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp