Stacey Sheldon
127ca1e7e1
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-20 13:56:18 -04:00
..
2012-05-28 19:06:25 +03:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2011-04-23 21:11:17 +02:00
2012-09-16 21:44:09 +02:00
2012-01-23 16:58:07 -06:00
2012-05-22 21:50:53 -04:00
2012-01-14 14:23:18 -05:00
2012-01-14 14:23:18 -05:00
2012-01-14 14:23:18 -05:00
2012-01-14 14:23:18 -05:00
2012-04-28 19:29:25 -07:00
2011-08-27 21:39:56 -04:00
2012-05-05 09:40:44 -07:00
2011-11-19 17:33:04 +02:00
2011-11-04 21:40:34 +02:00
2012-04-28 19:29:25 -07:00
2012-04-18 10:48:31 +02:00
2012-09-16 21:44:09 +02:00
2012-01-26 12:39:35 -06:00
2012-06-02 11:00:42 -05:00
2012-02-02 19:59:42 -07:00
2010-09-27 07:28:45 +00:00
2011-01-28 19:21:22 +00:00
2012-05-05 09:40:44 -07:00
2012-10-20 13:56:18 -04:00
2011-01-10 01:11:44 +00: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
2011-08-10 22:48:42 -05:00
2010-09-27 07:28:45 +00:00
2012-10-20 13:56:18 -04:00
2012-09-16 18:19:27 +02:00
2012-01-22 18:22:59 -05:00
2012-10-20 13:56:18 -04:00
2012-07-08 21:46:59 +02:00
2012-07-08 21:46:59 +02:00
2012-02-13 01:49:54 -06:00
2011-01-13 14:36:32 +00:00
2011-02-14 01:17:32 +00:00
2011-08-27 21:39:56 -04:00
2011-07-05 22:03:25 -04:00
2011-08-27 21:39:56 -04:00
2011-07-05 22:03:25 -04:00
2012-01-02 23:33:07 -05:00
2011-09-04 12:37:39 -05:00
2012-06-04 16:59:31 -07:00
2012-05-01 20:48:35 -07:00
2011-07-05 22:03:25 -04:00
2011-07-05 22:03:25 -04:00
2011-10-22 00:44:09 +03:00
2011-10-22 00:44:09 +03:00
2011-02-12 22:19:50 +00:00
2011-08-27 21:39:56 -04:00
2012-08-11 19:46:00 -04: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-07 21:49:53 -04:00
2012-05-19 16:06:48 -04:00
2011-08-27 21:39:56 -04:00
2011-08-27 21:39:56 -04:00
2012-01-02 23:33:07 -05:00
2012-01-02 23:33:07 -05:00
2012-01-16 21:32:52 -05:00
2012-05-05 09:40:44 -07:00
2012-09-27 22:42:44 -04:00
2012-01-16 21:32:52 -05:00
2012-01-16 21:32:52 -05:00
2010-09-27 07:28:45 +00: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-08-06 11:42:44 -04:00
2012-08-10 23:36:06 -04:00
2012-06-04 16:59:31 -07:00
2012-05-22 00:21:24 -04:00
2012-05-05 09:40:44 -07:00
2012-10-20 13:56:18 -04:00
2012-07-30 11:45:36 +03:00
2011-01-13 19:01:33 +00:00
2011-08-06 19:36:56 -05:00
2011-11-01 03:19:58 -05:00
2010-09-27 07:28:45 +00:00
2012-01-02 14:27:06 -05:00