James Cotton 3ef01569b8 Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next ... Conflicts: flight/OpenPilot/System/openpilot.c shared/uavobjectdefinition/positionactual.xml shared/uavobjectdefinition/positiondesired.xml shared/uavobjectdefinition/velocityactual.xml shared/uavobjectdefinition/velocitydesired.xml		2012-05-04 13:21:23 -05:00
..
System	Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next	2012-05-04 13:21:23 -05:00
Makefile	Reenable PIOS_ADC for coptercontrol	2012-05-01 00:30:41 -05:00