1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight/CopterControl/System
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
..
inc Better separation between UBX and NMEA parser 2012-07-10 11:01:41 +02:00
alarms.c Register some missing objects with their modules 2011-07-30 11:28:21 +09:00
coptercontrol.c Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next 2012-05-04 13:21:23 -05:00
pios_board_posix.c Disable auto registration of all objects. Later the uavobj_init linker scripts 2011-07-30 10:24:46 +09:00
pios_board.c Merge branch 'next' into revo 2012-06-03 19:00:51 -05:00
pios_usb_board_data.c usb serial: refactor serial number construction 2012-05-19 16:15:47 -04:00