mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-19 04:52:12 +01:00
cb442f0481
Conflicts: flight/Modules/Osd/osdgen/osdgen.c flight/OSD/Makefile flight/PiOS/Common/pios_video.c shared/uavobjectdefinition/osdsettings.xml