1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
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-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-01-23 16:58:07 -06:00
2012-05-05 09:40:44 -07:00
2012-04-18 10:48:31 +02:00
2010-09-27 07:28:45 +00:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2010-09-27 07:28:45 +00:00
2012-05-01 20:48:35 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-06-04 16:59:31 -07:00
2012-05-05 09:40:44 -07:00