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
..
linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07:00
osx	Work on the OSX packaging to get it working for revo and to package OSG.	2012-06-13 12:30:07 -05:00
winx86	AeroSimRC: add plugin option to Windows installer	2012-07-20 22:37:36 +03:00
Makefile	For now disable the bootloader updaters from being built with packaging. They	2012-06-13 02:58:44 -05:00
Makefile.linux	Allow building an unsigned linux package until we have official OP signing keys	2012-07-18 17:01:39 -05:00
Makefile.osx	OSX Packaging: Go back to release configuration for build	2011-08-04 20:54:59 -05:00
Makefile.winx86	package: now it is called 'make package' instead of 'make release'	2011-05-28 03:14:51 +03:00