James Cotton 93faf131b0 Merge branch 'next' into revo ...

Conflicts:
	flight/Modules/GPS/GPS.c
	flight/Modules/GPS/NMEA.c
	flight/Modules/GPS/UBX.c
	flight/Modules/GPS/inc/NMEA.h
	flight/Modules/GPS/inc/UBX.h
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h
	shared/uavobjectdefinition/gpsvelocity.xml

2012-07-22 00:43:19 -05:00

..

System

Speed up attitude loop on Revo to 666 Hz

2012-07-21 17:25:06 -05:00

Makefile

Backport the fixed wing path follower

2012-06-08 10:46:39 -05:00

Makefile.osx

Backport the fixed wing path follower

2012-06-08 10:46:39 -05:00

UAVObjects.inc

Merge branch 'next' into revo

2012-07-22 00:43:19 -05:00