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
..
2012-06-24 14:06:51 +02:00
2012-05-05 09:40:44 -07:00
2012-04-18 14:41:41 +02:00
2012-05-05 09:40:44 -07:00
2012-04-06 13:58:46 -05:00
2012-07-21 17:24:58 -05:00
2012-06-15 19:43:47 -05:00
2012-01-17 22:35:36 -05:00
2012-01-14 16:55:55 -05:00
2011-07-12 20:44:32 -07:00
2012-01-14 16:55:55 -05:00
2012-05-05 09:40:44 -07:00
2012-06-08 11:44:22 -05:00
2012-07-07 21:49:53 -04:00
2012-07-21 14:42:04 -04:00
2012-07-13 10:40:14 -05:00
2011-01-14 01:38:19 +00:00
2012-05-05 09:40:44 -07:00
2012-07-20 13:45:31 -05:00
2012-06-08 14:12:52 -05:00
2012-05-18 17:42:25 -07:00
2012-07-14 17:14:43 -07:00
2012-07-21 17:24:58 -05:00
2012-07-03 14:19:21 +02:00
2012-07-03 10:53:10 +02:00
2012-05-05 09:40:44 -07:00
2012-05-28 12:48:55 +03:00
2012-06-08 10:46:40 -05:00