mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-23 15:19:43 +01:00
Conflicts: ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
Conflicts: ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h