Stacey Sheldon 2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next ... Conflicts: Makefile flight/Modules/Attitude/revolution/attitude.c flight/Modules/Battery/battery.c flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c flight/Modules/GPS/GPS.c flight/Modules/ManualControl/inc/manualcontrol.h flight/Modules/ManualControl/manualcontrol.c flight/Modules/OveroSync/overosync.c flight/Modules/PathPlanner/inc/pathplanner.h flight/Modules/PathPlanner/pathplanner.c flight/Modules/Sensors/sensors.c flight/Modules/VtolPathFollower/vtolpathfollower.c flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/Boards/pios_board.h flight/PiOS/STM32F4xx/library.mk flight/PiOS/inc/pios_hmc5883.h flight/PiOS/inc/pios_l3gd20.h flight/PiOS/inc/pios_rfm22b_priv.h flight/Revolution/Makefile flight/Revolution/Makefile.osx flight/Revolution/System/inc/pios_config.h flight/Revolution/UAVObjects.inc ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.h ground/openpilotgcs/src/plugins/config/configrevowidget.cpp ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro package/Makefile shared/uavobjectdefinition/fixedwingpathfollowersettings.xml shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/pathdesired.xml shared/uavobjectdefinition/vtolpathfollowersettings.xml shared/uavobjectdefinition/waypoint.xml		2012-10-30 00:08:43 -04: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	Merge branch 'dynamic_uavo_next' into revo	2012-10-10 08:27:11 -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	Merge branch 'dynamic_uavo_next' into revo	2012-10-10 08:27:11 -05:00
src	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
.classpath	AndroidGCS: Remove the unit tests since they break the dynamic loading of UAVObjects	2012-10-10 00:29:22 -05:00
.project	Trying to get eclipse project right	2012-08-06 16:54:17 -05:00
AndroidManifest.xml	Merge branch 'dynamic_uavo_next' into revo	2012-10-10 08:27:11 -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