1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
LibrePilot/make
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
..
scripts OP-719: make/scripts/win_sdk_install.sh 2013-04-12 10:56:06 +02:00
templates OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
winx86 tools: Makefile and sh.cmd minor updates (mostly comments) 2013-04-04 23:57:43 +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
apps-defs.mk Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3 2013-04-24 00:37:39 +03:00
boot-defs.mk Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3 2013-04-24 00:37:39 +03:00
common-defs.mk make: fix bu_* targets 2013-04-18 17:50:34 +03:00
firmware-defs.mk Final step: lot of small fixes, last commit in this commit series 2013-03-24 13:06:24 +02:00
tools.mk tools: fix typo in comments 2013-04-18 16:03:05 +02:00
unittest.mk ut: change xml output directory to make Bamboo a bit happier 2013-03-03 14:33:04 +01:00