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
..
openpilotgcs	Merge branch 'next' into MikeL	2012-06-04 16:59:31 -07:00
uavobjects	Fix 64-Bit Linux build problem in QT-Creator	2011-04-03 16:25:21 +00:00
uavobjgenerator	Merged latest origin/next.	2012-05-05 09:40:44 -07:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00