1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-20 05:52:11 +01:00
zedamota 74108e200b Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework
Conflicts:
	ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
	ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
	ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h
	ground/openpilotgcs/src/plugins/config/stabilization.ui
2012-02-11 22:29:03 +00:00
..
2012-01-10 17:03:58 +00:00
2012-01-30 04:51:11 +11:00
2012-01-31 05:32:49 +11:00
2012-02-05 18:16:38 +00:00