1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-01 17:52:12 +01:00
PT_Dreamer 4dc5e4580d Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
2012-07-29 14:28:59 +01:00
..
2012-02-05 18:16:38 +00:00
2012-07-09 08:59:52 -07:00