James Cotton 0f4a0526ac Merge branch 'next' into revo ... Conflicts: androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java		2012-09-12 02:44:04 -05:00
..
.metadata	Update the project and checked in the meta data. Hopefully this will make it	2012-08-06 16:54:54 -05:00
.settings	Update the project and checked in the meta data. Hopefully this will make it	2012-08-06 16:54:54 -05:00
assets/models	AndroidGCS OSG: Switch to hardcoded quad model instead of cow. The quad file was made from the 3DS models using	2012-08-21 15:24:07 -05:00
Doc	More work on the object browser/editor. Hard to make it resize itself though.	2012-08-06 16:54:53 -05:00
jni	AndroidGCS OSG: Force inclusion of the 3DS plugin and use a 3DS model. Also include the jpeg and png libraries and plugins to load the textures. However they currently aren't visible.	2012-08-23 11:20:01 -05:00
res	AndroidGCS Controller: Make the default value mode 2	2012-08-30 12:14:07 -05:00
src	Merge branch 'next' into revo	2012-09-12 02:44:04 -05:00
tests/org/openpilot/uavtalk	AndroidGCS: Start moving the telemetry object queue to a handler and a looper	2012-08-16 03:44:11 -05:00
.classpath	Small upgrades to teh android install	2012-08-06 16:54:54 -05:00
.project	Trying to get eclipse project right	2012-08-06 16:54:17 -05:00
AndroidManifest.xml	Merge branch 'android' into revo-mini	2012-08-30 12:10:12 -05:00
lint.xml	Update the project and checked in the meta data. Hopefully this will make it	2012-08-06 16:54:54 -05:00
proguard.cfg	Small upgrades to teh android install	2012-08-06 16:54:54 -05:00
project.properties	Update the sdk version	2012-08-06 16:54:56 -05:00