James Cotton 6bfb2a5e45 Merge branch 'next' into revo ... Conflicts: ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp ground/openpilotgcs/src/libs/utils/coordinateconversions.h ground/openpilotgcs/src/plugins/opmap/opmap.pro ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp shared/uavobjectdefinition/taskinfo.xml shared/uavobjectdefinition/waypoint.xml		2012-09-01 16:18:03 -05:00
..
bin	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00
share	Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module	2012-08-01 19:53:59 +09:30
src	Merge branch 'next' into revo	2012-09-01 16:18:03 -05: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