Mike LaBranche 0ba8345c51 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 16:59:31 -07:00
..
Boards	SimPosix: Reenabled File IO for UAVObject saving	2012-05-22 18:32:52 +02:00
inc	PiOS.posix: added missing header definition to use FreeRTOS tasks in udp driver if applicable	2012-05-22 18:32:47 +02:00
posix	Merge branch 'next' into MikeL	2012-06-04 16:59:31 -07:00
pios.h	Created new "SimPosix" board and ported PiOS.posix to revolution API and more "standard like" configuration akin to other "boards"	2012-05-22 18:32:27 +02:00