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-09-04 23:22:56 -05:00
2012-08-25 12:23:54 -05:00
2012-09-10 14:37:52 -05:00
2012-05-05 09:40:44 -07:00
2012-09-05 21:45:59 -04:00
2012-09-10 14:37:52 -05:00
2012-09-10 14:37:52 -05:00
2012-05-05 09:40:44 -07:00
2012-09-10 14:37:52 -05:00
2012-07-23 09:19:28 -05:00
2012-09-01 16:18:03 -05:00
2012-09-01 16:18:03 -05:00
2012-09-01 19:14:36 -05:00
2012-07-07 10:36:36 -04:00
2012-06-04 16:59:31 -07:00
2012-09-10 14:37:52 -05:00
2012-09-10 14:37:52 -05:00
2012-08-01 19:53:59 +09:30
2012-08-11 18:47:03 -04:00
2012-08-24 19:42:10 -07:00
2009-12-22 05:07:27 +00:00