Mike LaBranche bf591ebe45 Merge branch 'next' into MikeL ... Conflicts: flight/Bootloaders/Revolution/inc/pios_config.h flight/Modules/OveroSync/inc/overosync.h flight/Modules/Sensors/inc/sensors.h flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/STM32F4xx/pios_iap.c flight/Revolution/System/inc/pios_config.h ground/openpilotgcs/src/plugins/config/config.pro ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp		2012-06-04 15:38:57 -07:00
..
sensors.h	Merge branch 'next' into MikeL	2012-06-04 15:38:57 -07:00