mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-01 17:52:12 +01:00
9896a0d416
Conflicts: ground/openpilotgcs/src/libs/utils/homelocationutil.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.h ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp shared/uavobjectdefinition/taskinfo.xml