mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-31 18:25:17 +02:00
Conflicts: flight/Modules/Osd/osdgen/osdgen.c flight/OSD/Makefile flight/PiOS/Common/pios_video.c shared/uavobjectdefinition/osdsettings.xml