1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
James Cotton 51683ffb65 Merge branch 'next' into revo
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
2012-09-15 16:31:30 -05:00
..
2012-09-15 16:31:30 -05:00