LibrePilot

mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-01 19:25:17 +02:00

Go to file

Oleg Semyonov 406339eb49 Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3

Conflicts:
	flight/Libraries/inc/op_dfu.h
	flight/Libraries/op_dfu.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/OSD/op_dfu.c
	flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
	flight/targets/boards/coptercontrol/bootloader/op_dfu.c
	flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
	flight/targets/boards/oplinkmini/bootloader/op_dfu.c
	flight/targets/boards/osd/bootloader/inc/op_dfu.h
	flight/targets/boards/osd/bootloader/op_dfu.c
	flight/targets/boards/revolution/bootloader/inc/op_dfu.h
	flight/targets/boards/revolution/bootloader/op_dfu.c
	flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
	flight/targets/boards/sensortest/bootloader/op_dfu.c
	make/boot-defs.mk

2013-04-24 00:37:39 +03:00

androidgcs

OP-825 Fix null reference and race condition when shutting down service

2013-02-10 01:20:11 +00:00

androidgcstests

OP-825 Add connection tests for TCP and USB

2013-02-10 01:18:24 +00:00

artwork

Merge remote-tracking branch 'origin/muralha/artwork' into thread/OP-885_Update_Boards_Artwork

2013-04-02 19:43:29 +02:00

flight

Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3