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
..
2012-08-25 11:41:32 -07:00
2012-09-10 03:14:02 -05:00
2011-03-03 02:22:50 +00:00
2012-08-22 06:46:51 -07:00
2012-08-24 19:26:06 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-07-21 15:11:04 -05:00
2012-04-15 11:50:11 -05:00
2011-11-13 18:51:35 -06:00
2012-08-25 11:41:32 -07:00
2012-05-26 15:24:50 -05:00
2011-05-08 12:41:02 -04:00
2012-04-03 09:16:27 -05:00
2012-07-31 00:18:10 +02:00