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
..
inc	Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3	2013-04-24 00:37:39 +03:00
main.c	Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3	2013-04-24 00:37:39 +03:00
Makefile	OP-899: move board-info.mk from make/boards to board directories	2013-04-24 00:07:06 +03:00
pios_board.c	OP-899: move board_hw_defs.c under board directories and fix some includes	2013-04-24 00:07:06 +03:00