mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-05 21:52:10 +01:00
Conflicts: flight/Modules/FirmwareIAP/firmwareiap.c flight/Modules/ManualControl/manualcontrol.c flight/targets/SimPosix/Makefile shared/uavobjectdefinition/systemalarms.xml