Stacey Sheldon 2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next ... Conflicts: Makefile flight/Modules/Attitude/revolution/attitude.c flight/Modules/Battery/battery.c flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c flight/Modules/GPS/GPS.c flight/Modules/ManualControl/inc/manualcontrol.h flight/Modules/ManualControl/manualcontrol.c flight/Modules/OveroSync/overosync.c flight/Modules/PathPlanner/inc/pathplanner.h flight/Modules/PathPlanner/pathplanner.c flight/Modules/Sensors/sensors.c flight/Modules/VtolPathFollower/vtolpathfollower.c flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/Boards/pios_board.h flight/PiOS/STM32F4xx/library.mk flight/PiOS/inc/pios_hmc5883.h flight/PiOS/inc/pios_l3gd20.h flight/PiOS/inc/pios_rfm22b_priv.h flight/Revolution/Makefile flight/Revolution/Makefile.osx flight/Revolution/System/inc/pios_config.h flight/Revolution/UAVObjects.inc ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.h ground/openpilotgcs/src/plugins/config/configrevowidget.cpp ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro package/Makefile shared/uavobjectdefinition/fixedwingpathfollowersettings.xml shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/pathdesired.xml shared/uavobjectdefinition/vtolpathfollowersettings.xml shared/uavobjectdefinition/waypoint.xml		2012-10-30 00:08:43 -04:00
..
CMSIS2/Device/ST/STM32F4xx	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
FreeRTOS/Source/portable	Upgrade to FreeRTOS 7.2.0	2012-10-09 09:48:02 -05:00
STM32_USB_Device_Library	f4 usb: configure and build ST USB OTG and USB DEV libraries	2012-02-07 02:25:31 -05:00
STM32_USB_OTG_Driver	f4 usb_dcd: disable FIFO empty IRQ while waiting for tx completion	2012-03-07 20:36:37 -05:00
STM32F4xx_StdPeriph_Driver	Bring F4 PiOS up to date with some of our timer conventions	2011-11-01 04:39:51 -05:00