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
..
2012-05-03 17:00:41 -05:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-10-30 00:08:43 -04:00
2012-08-29 16:04:47 +02:00
2012-07-20 13:08:54 +02:00
2012-05-03 17:00:41 -05:00
2012-02-08 09:42:10 -06:00
2012-05-12 13:12:56 -05:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-05-07 22:22:30 -05:00
2012-07-24 15:15:21 +02:00
2012-07-09 15:21:20 +01:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-09-17 17:08:15 +01:00
2012-06-15 18:02:24 +03:00
2012-06-15 18:02:24 +03:00
2012-09-01 11:03:32 -05:00
2012-06-15 19:43:34 -05:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-04-21 11:59:14 -07:00
2012-09-16 09:56:35 -04:00
2011-01-22 17:38:43 +00:00
2012-06-09 10:54:07 -07:00
2012-04-21 11:59:14 -07:00
2011-02-12 22:19:38 +00:00
2011-01-22 17:38:43 +00:00
2012-08-25 19:16:16 -05:00
2011-02-27 00:38:59 +00:00
2012-07-19 20:48:35 +02:00
2012-07-09 15:21:20 +01:00
2012-05-03 17:00:41 -05:00
2012-07-10 23:06:42 +02:00
2012-10-30 00:08:43 -04:00
2011-02-27 00:38:59 +00:00
2012-07-25 11:07:40 -05:00
2012-07-09 15:21:20 +01:00
2012-04-21 11:59:14 -07:00
2012-10-30 00:08:43 -04:00
2012-09-08 14:41:55 +09:30
2012-03-27 10:06:27 -05:00
2012-05-05 09:40:44 -07:00
2012-04-03 03:42:24 -05:00
2012-06-02 10:23:27 -05:00
2012-05-28 19:06:25 +03:00
2012-07-14 17:38:49 -05:00
2012-07-17 17:21:51 -05:00
2012-06-01 19:14:50 +01:00
2012-10-30 00:08:43 -04:00
2012-05-21 12:10:00 +02:00
2012-05-28 20:50:09 +02:00
2012-10-04 16:41:02 -05:00
2012-10-04 21:11:40 -07:00
2012-05-08 03:04:44 -05:00
2011-01-22 17:38:43 +00:00
2012-04-21 11:59:14 -07:00
2012-09-24 22:47:18 +01:00
2012-08-24 23:06:41 -05:00
2012-07-25 11:23:27 -05:00
2012-06-17 10:21:58 +03:00
2012-07-09 15:21:20 +01:00
2012-08-03 09:37:45 -05:00
2012-09-11 12:29:38 -05:00
2012-07-31 11:07:07 +09:30
2012-07-07 15:42:31 -04:00
2012-05-05 09:40:44 -07:00
2012-09-27 22:42:44 -04:00
2012-05-28 12:48:55 +03:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-06-08 10:46:38 -05:00
2011-01-22 17:38:43 +00:00
2012-06-03 22:14:11 -05:00
2012-06-01 19:14:50 +01:00