Corvus Corax e1233c7780 Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay ... Conflicts: flight/targets/Revolution/System/inc/openpilot.h flight/targets/SimPosix/System/inc/openpilot.h flight/targets/boards/coptercontrol/firmware/inc/openpilot.h flight/targets/boards/oplinkmini/firmware/inc/openpilot.h flight/targets/boards/revolution/firmware/inc/openpilot.h flight/targets/boards/revoproto/firmware/inc/openpilot.h		2013-04-27 13:26:03 +02:00
..
bootloader	Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3	2013-04-24 00:37:39 +03:00
firmware	Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay	2013-04-27 13:26:03 +02:00
board_hw_defs.c	OP-899: move board_hw_defs.c under board directories and fix some includes	2013-04-24 00:07:06 +03:00
board-info.mk	Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3	2013-04-24 00:37:39 +03:00
pios_board.h	OP-899: move board-specific pios_board.h files into board directories	2013-04-24 00:07:06 +03:00
pios_usb_board_data.c	OP-899: remove extra copy of pios_usb_data.c and move it level up	2013-04-24 00:07:06 +03:00