James Cotton 38e9d105aa Merge branch 'pidt1' into test2 ... Conflicts: flight/Modules/ManualControl/inc/manualcontrol.h ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-10 14:37:52 -05:00
..
app	Update the OSX packaged icons to those from 3rdeyepro / dacat.	2012-08-28 18:32:49 -05:00
experimental	This should fix the upload CLI tool.	2011-05-23 11:55:09 +01:00
libs	Merge branch 'next' into test2	2012-09-10 14:29:26 -05:00
plugins	Merge branch 'pidt1' into test2	2012-09-10 14:37:52 -05:00
shared	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00
openpilotgcslibrary.pri	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
openpilotgcsplugin.pri	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
rpath.pri	On OSX make the plugins in .app/Contents/Plugins instead of PlugIns	2011-06-01 13:58:49 -05:00
src.pro	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00