James Cotton 75db0fcb35 Merge branch 'next' into revo ...

Conflicts:
	flight/Modules/GPS/GPS.c
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/systemalarms.xml

2012-08-12 14:38:38 -05:00

..

inc

Merge remote-tracking branch 'origin/hyper/OP-661' into next

2012-08-08 13:49:48 -05: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