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
..
System	Merge branch 'next' into MikeL	2012-06-04 16:59:31 -07:00
Makefile	Merge remote-tracking branch 'op-public/next' into revo-next	2012-10-20 13:56:18 -04:00
UAVObjects.inc	simposix: adapt simposix to addition of relay tuning	2012-09-16 15:40:47 -04:00