Stacey Sheldon f5db83bd20 Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: flight/Libraries/inc/NMEA.h 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/Modules/PathPlanner/inc/pathplanner.h flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld flight/Revolution/System/inc/pios_config.h flight/Revolution/UAVObjects.inc flight/SimPosix/UAVObjects.inc ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro shared/uavobjectdefinition/gpsvelocity.xml		2012-07-22 23:39:37 -04:00
..
System	Merge branch 'next' into MikeL	2012-06-04 16:59:31 -07:00
Makefile	Merge remote-tracking branch 'op-public/next' into revo-next	2012-07-22 23:39:37 -04:00
UAVObjects.inc	Merge remote-tracking branch 'op-public/next' into revo-next	2012-07-22 23:39:37 -04:00