1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Sambas cb442f0481 Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1
Conflicts:
	flight/Modules/Osd/osdgen/osdgen.c
	flight/OSD/Makefile
	flight/PiOS/Common/pios_video.c
	shared/uavobjectdefinition/osdsettings.xml
2012-03-11 11:39:29 +02:00
..