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
..
bin	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00
share	Merge branch 'master' into next	2012-10-16 14:26:35 -05:00
src	Merge remote-tracking branch 'op-public/next' into revo-next	2012-10-20 13:56:18 -04:00
copydata.pro	Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)	2012-07-29 23:59:54 +03:00
openpilotgcs.pri	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
openpilotgcs.pro	OP-483: remove gcs/packaging subdirectory (not required anymore)	2011-05-19 13:08:54 +03:00