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
..
System	Merge branch 'next' into MikeL	2012-06-04 16:59:31 -07:00
Makefile	SimPosix: make use of compile time uavobjecto initialization function generation	2012-05-22 22:06:26 +02:00
UAVObjects.inc	test add of SimPosix architecture - doesnt work yet	2012-05-22 18:28:42 +02:00