James Cotton
d150fd5331
Merge branch 'next' into revo
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-13 10:40:14 -05:00
..
2012-07-01 23:22:55 -04:00
2012-05-22 18:32:27 +02:00
2011-08-14 14:21:54 +02:00
2011-06-10 17:16:15 +02:00
2012-05-22 18:32:27 +02:00
2012-06-29 15:06:50 +02:00
2011-08-14 14:21:54 +02:00
2012-05-22 18:32:27 +02:00
2011-10-11 18:07:04 +02:00
2011-01-16 15:17:57 +00:00
2011-02-01 15:47:02 +00:00
2010-07-03 21:50:13 +00:00
2012-05-22 18:32:27 +02:00
2011-01-16 15:17:57 +00:00