Stacey Sheldon
754f58c33a
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Revolution/Makefile.osx
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04:00
..
2011-01-22 17:40:26 +00:00
2012-09-16 09:56:35 -04:00
2011-01-22 17:40:26 +00:00
2012-09-14 14:12:16 +01:00
2012-02-05 18:16:38 +00:00
2012-08-09 22:04:40 +10:00
2011-01-22 17:40:26 +00:00
2011-02-01 23:01:52 +00:00
2012-09-09 13:04:29 +01:00
2012-08-23 18:03:17 +02:00
2012-09-15 19:55:47 -04:00
2012-07-30 00:08:43 +03:00
2011-06-13 18:59:53 +02:00
2012-09-11 10:21:01 -05:00
2012-08-09 22:04:40 +10:00
2011-11-25 15:11:58 +01:00
2012-09-16 09:56:35 -04:00
2012-03-19 20:41:28 +01:00
2012-09-12 16:06:47 -05:00
2012-09-09 13:04:29 +01:00
2012-04-03 09:17:56 -05:00
2012-05-31 04:11:13 +02:00
2012-09-16 09:56:35 -04:00
2012-09-13 09:46:03 -05:00
2011-03-20 15:54:23 +00:00
2012-09-09 13:04:29 +01:00
2012-09-11 10:18:45 -05:00
2012-07-25 01:34:38 +02:00
2012-08-23 18:03:17 +02:00
2012-07-11 13:10:02 -05:00
2012-07-27 11:19:41 +01:00
2012-09-16 09:56:35 -04:00
2012-09-16 09:56:35 -04:00
2012-09-13 16:25:32 +01:00
2012-07-30 14:53:57 +01:00
2012-09-09 13:04:29 +01:00
2012-09-16 09:56:35 -04:00
2012-05-12 13:12:56 -05:00
2012-08-22 09:00:29 +10:00
2012-09-16 09:56:35 -04:00