James Cotton 38e9d105aa Merge branch 'pidt1' into test2 ... Conflicts: flight/Modules/ManualControl/inc/manualcontrol.h ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-10 14:37:52 -05:00
..
System	RM: Make radio an optional module	2012-09-01 11:11:52 -05:00
Makefile	Merge branch 'pidt1' into test2	2012-09-10 14:37:52 -05:00
Makefile.osx	Copy the revo project to revo mini	2012-08-25 12:23:54 -05:00
UAVObjects.inc	Merge branch 'pidt1' into test2	2012-09-10 14:37:52 -05:00