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
..
docs	GCS-Added UAVO to widget framework documentation	2012-07-27 12:14:26 +01:00
openpilotgcs	Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3	2013-04-24 00:37:39 +03:00
uavobject-synthetics	build: get rid of build/ground subdirectory, fix qt-creator builds	2013-03-30 17:33:38 +02:00
uavobjgenerator	OP-899: move UAVObjects and UAVTalk one level up from targets	2013-04-24 00:07:07 +03:00
.gitattributes	OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)	2013-04-05 23:43:58 +03:00
ground.pro	build: get rid of build/ground subdirectory, fix qt-creator builds	2013-03-30 17:33:38 +02:00