James Cotton f530702ce9 Merge branch 'android' into sim_android ... Conflicts: androidgcs/AndroidManifest.xml androidgcs/res/layout/gcs_home.xml androidgcs/res/layout/pfd.xml androidgcs/res/layout/system_alarms.xml androidgcs/src/org/openpilot/androidgcs/AttitudeView.java androidgcs/src/org/openpilot/androidgcs/BluetoothDevicePreference.java androidgcs/src/org/openpilot/androidgcs/CompassView.java androidgcs/src/org/openpilot/androidgcs/Controller.java androidgcs/src/org/openpilot/androidgcs/HomePage.java androidgcs/src/org/openpilot/androidgcs/Logger.java androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java androidgcs/src/org/openpilot/androidgcs/Preferences.java androidgcs/src/org/openpilot/androidgcs/SystemAlarmActivity.java androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java androidgcs/src/org/openpilot/androidgcs/UAVLocation.java androidgcs/src/org/openpilot/uavtalk/Telemetry.java androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java androidgcs/src/org/openpilot/uavtalk/UAVObject.java androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java androidgcs/src/org/openpilot/uavtalk/UAVTalk.java androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java flight/Modules/GPS/GPS.c		2012-08-08 15:50:28 -05:00
..
app	Set the grahpicssystem to "raster" in the code after the reported performance	2012-03-02 18:14:23 -06:00
experimental	This should fix the upload CLI tool.	2011-05-23 11:55:09 +01:00
libs	Merge branch 'android' into sim_android	2012-08-08 15:50:28 -05:00
plugins	Merge branch 'android' into sim_android	2012-08-08 15:50:28 -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