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-07-30 11:45:22 +03:00
2012-05-05 09:40:44 -07:00
2012-10-20 13:56:18 -04:00
2012-07-30 11:41:25 +03:00
2011-05-24 01:10:40 -04:00
2012-01-14 14:23:18 -05:00
2012-05-24 18:04:49 +03:00
2012-04-28 19:29:25 -07:00
2012-04-18 10:48:31 +02:00
2012-06-24 12:23:34 -04:00
2012-06-02 11:00:42 -05:00
2012-05-20 18:30:37 -07:00
2011-11-04 21:40:34 +02:00
2012-05-05 09:40:44 -07:00
2012-10-20 13:56:18 -04:00
2012-01-14 15:38:56 -05:00
2012-10-20 13:56:18 -04:00
2012-10-20 13:56:18 -04:00
2012-07-20 13:08:54 +02:00
2012-07-20 13:08:54 +02:00
2012-04-22 18:43:07 -05:00
2010-09-27 07:28:45 +00:00
2011-02-14 01:17:32 +00:00
2010-09-27 07:28:45 +00:00
2011-09-06 16:39:08 -05:00
2012-09-28 02:14:15 -05:00
2012-07-30 11:45:22 +03:00
2012-08-10 23:29:34 -04:00
2012-05-05 09:40:44 -07:00
2012-06-04 16:59:31 -07:00
2012-10-20 13:56:18 -04:00
2012-07-30 11:45:36 +03:00
2012-05-25 21:12:03 +03:00
2010-09-27 07:28:45 +00:00