1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight/Bootloaders
James Cotton c242ab8b86 Merge branch 'next' into revolution3
Conflicts:
	flight/AHRS/ahrs.c
	flight/AHRS/pios_board.c
	flight/Bootloaders/Revolution/Makefile
	flight/CopterControl/System/pios_board.c
	flight/INS/pios_board.c
	flight/OpenPilot/Makefile
	flight/OpenPilot/System/openpilot.c
	flight/OpenPilot/System/pios_board.c
	flight/PiOS/Boards/STM32103CB_CC_Rev1.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/Makefile
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/test.c
2012-01-24 10:46:35 -06:00
..
AHRS Merge branch 'next' into revolution3 2012-01-24 10:46:35 -06:00
BootloaderUpdater board_hw_defs: factor out board-specific hw config definitions 2012-01-22 19:41:41 -05:00
CopterControl Merge branch 'next' into revolution3 2012-01-24 10:46:35 -06:00
OpenPilot Merge branch 'next' into revolution3 2012-01-24 10:46:35 -06:00
PipXtreme Merge branch 'next' into revolution3 2012-01-24 10:46:35 -06:00
Revolution Merge branch 'next' into revolution3 2012-01-24 10:46:35 -06:00