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
..
pios_usb_board_data.c	usb: allow runtime selection of USB descriptors via hwsettings	2012-01-14 14:28:15 -05:00