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
..
aggregation	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
eigen	spellcheck comments: no substantive changes	2011-04-10 18:32:19 +00:00
extensionsystem	OP-608	2012-01-10 17:03:58 +00:00
glc_lib	Comment the line "VERSION = 2.2.0"	2012-03-20 00:10:31 +01:00
juavobjects	AndroidGCS: Clean up some warnings in UAVO templates	2012-08-06 16:55:00 -05:00
juavtalk	adding juavtalk	2011-04-09 04:32:26 +00:00
libqxt	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
opmapcontrol	Dragging and dropping waypoints now works and updates the FC immediately.	2012-06-05 10:01:12 -05:00
qextserialport	gcs: properly label ttyACM devices in gcs pull-down selector	2011-12-30 23:05:33 -05:00
qscispinbox	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
qtconcurrent	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
qwt	Merge remote-tracking branch 'remotes/origin/next' into qwt_6.0.1_upgrade	2012-02-10 17:27:23 +02:00
sdlgamepad	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
utils	Merge branch 'android' into sim_android	2012-08-08 15:50:28 -05:00
libs.pro	OP-179: fix library dependencies	2011-05-09 21:05:23 +03:00