3 Commits

Author	SHA1	Message	Date
Sexy Pony	900f643bbd	Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES	2013-05-19 17:37:30 +03:00
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
Fredrik Arvidsson	e891cd2dc3	Added some more wizard pages. The basic structure for multirotors is in place.	2012-08-01 00:21:15 +02:00