mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
Conflicts: ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp