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-08-24 12:04:05 +02:00
2012-05-05 09:40:44 -07:00
2012-07-24 15:16:52 +02:00
2012-05-05 09:40:44 -07:00
2012-04-06 13:58:46 -05:00
2012-09-16 09:56:35 -04:00
2012-08-24 21:32:11 -05:00
2012-07-08 23:13:05 +02:00
2012-01-17 22:35:36 -05:00
2012-01-14 16:55:55 -05:00
2011-07-12 20:44:32 -07:00
2012-07-30 12:20:18 +03:00
2012-01-14 16:55:55 -05:00
2012-05-05 09:40:44 -07:00
2012-07-24 15:15:21 +02:00
2012-07-07 21:49:53 -04:00
2012-08-25 14:57:16 -04:00
2012-09-16 09:56:35 -04:00
2011-01-14 01:38:19 +00:00
2012-07-30 11:47:34 +03:00
2012-10-20 13:56:18 -04:00
2012-07-24 15:15:21 +02:00
2012-05-18 17:42:25 -07:00
2012-07-14 17:14:43 -07:00
2012-06-04 15:38:57 -07:00
2012-09-27 19:29:23 +02:00
2012-10-11 00:22:07 -04:00
2012-05-05 09:40:44 -07:00
2012-05-28 12:48:55 +03:00
2012-06-07 17:42:51 +03:00