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
..
configtaskwidget.cpp	Merge branch 'next' into revo	2012-09-26 00:43:02 -05:00
configtaskwidget.h	Merge branch 'next' into revo	2012-09-15 16:31:30 -05:00
mixercurveline.cpp	GCS-Minor cleaning acording to review comments	2012-09-13 16:25:32 +01:00
mixercurveline.h	GCS-Review comments changes	2012-09-12 11:09:30 +01:00
mixercurvepoint.cpp	GCS-Review comments changes	2012-09-12 11:09:30 +01:00
mixercurvepoint.h	GCS-Review comments changes	2012-09-12 11:09:30 +01:00
mixercurvewidget.cpp	GCS-Review comments changes	2012-09-12 11:09:30 +01:00
mixercurvewidget.h	GCS-Review comments changes	2012-09-12 11:09:30 +01:00
popupwidget.cpp	PopupWidget: Start the dialog at twice the size of the embedded widget.	2012-07-30 15:02:18 -07:00
popupwidget.h	PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from;	2012-07-30 14:45:56 -07:00
smartsavebutton.cpp	Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release	2012-08-21 17:05:36 +01:00
smartsavebutton.h	GCS - Make the save/apply operation result icons disappear when the form contents changes.	2012-03-02 18:47:24 +00:00
uavobjectwidgetutils_dependencies.pri	GCS: fix plugin build dependencies	2012-10-09 21:57:58 +03:00
uavobjectwidgetutils_global.h	Corrected file headers	2012-02-05 20:07:19 +00:00
UAVObjectWidgetUtils.pluginspec	Moved framework to its own plugin	2012-02-05 18:16:38 +00:00
uavobjectwidgetutils.pri	Moved framework to its own plugin	2012-02-05 18:16:38 +00:00
uavobjectwidgetutils.pro	MixerCurve, Popup Dialog Support.	2012-07-13 13:44:56 -07:00
uavobjectwidgetutilsplugin.cpp	Corrected file headers	2012-02-05 20:07:19 +00:00
uavobjectwidgetutilsplugin.h	Corrected file headers	2012-02-05 20:07:19 +00:00