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	Merge branch 'next' into revo	2012-07-22 00:43:19 -05:00
Makefile	Better separation between UBX and NMEA parser	2012-07-10 11:01:41 +02:00