Fredrik Arvidsson bd3d3708eb Merge branch 'next' into thread/OP-39 ... Conflicts: ground/openpilotgcs/src/plugins/config/configinputwidget.cpp ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc		2012-09-16 15:14:47 +02:00
..
openpilotgcs	GCS- Config fix and new copy method for data collections	2012-09-12 13:39:35 +01:00
share.pro	Merge branch 'next' into thread/OP-39	2012-09-16 15:14:47 +02:00