James Cotton bb0bfe0ae4 Merge branch 'next' into revolution3 ... Conflicts: flight/Bootloaders/CopterControl/Makefile flight/Bootloaders/PipXtreme/Makefile flight/Bootloaders/Revolution/inc/pios_config.h flight/CopterControl/Makefile flight/INS/inc/pios_config.h flight/Libraries/taskmonitor.c flight/Modules/Altitude/altitude.c flight/Modules/Attitude/attitude.c flight/OpenPilot/Makefile flight/OpenPilot/Makefile.posix flight/OpenPilot/System/inc/pios_usb_board_data.h flight/OpenPilot/System/inc/taskmonitor.h flight/OpenPilot/System/pios_board.c flight/OpenPilot/System/taskmonitor.c flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/STM32F4xx/pios_bmp085.c flight/PiOS/STM32F4xx/pios_iap.c flight/PiOS/pios.h flight/Revolution/System/inc/pios_config.h flight/Revolution/System/inc/taskmonitor.h flight/Revolution/System/taskmonitor.c ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp shared/uavobjectdefinition/systemalarms.xml shared/uavobjectdefinition/taskinfo.xml		2012-01-21 11:27:03 -06:00
..
ahrs	openocd: collapse JTAG rules for STM32F1 and STM32F2	2011-08-27 10:43:02 -04:00
coptercontrol	bl: bump CC bootloader version to reflect safe boot support	2012-01-07 09:52:46 -05:00
esc	Make new Revolution target	2011-11-01 01:17:59 -05:00
ins	Various tweaks to get the F4 working	2011-10-26 21:56:00 -05:00
openpilot	safeboot: add safe boot support to OP and PIPX bootloaders	2012-01-14 14:28:11 -05:00
pipxtreme	safeboot: add safe boot support to OP and PIPX bootloaders	2012-01-14 14:28:11 -05:00
revolution	Configuration tab for revo	2011-12-24 14:08:08 -06:00