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
..
boards	build: use board-specific JTAG interface for openocd	2012-06-21 23:32:04 -04:00
scripts	uavohash: normalize line endings before computing hash	2012-10-14 13:33:58 -04:00
templates	GCS/Uploader Changes acording to review	2012-09-24 12:17:32 +01:00
winx86	Windows packaging: update sh.cmd script for QtSDK 1.2.1	2012-07-29 23:59:58 +03:00
firmware-defs.mk	Flight-Added sha1 uavo directory calculation to fw_version_info struct.	2012-09-14 23:31:13 +01:00