Merge branch 'master' of github.com:mavlink/qgroundcontrol into config

src/ui/main/QGCWelcomeMainWindow.cc

@@ -47,13 +47,3 @@ QGCWelcomeMainWindow::~QGCWelcomeMainWindow()
     delete ui;
     delete viewModeSelection;
 }
-
-enum MainWindow::CUSTOM_MODE QGCWelcomeMainWindow::getCustomMode()
-{
-//    QGCViewModeSelection* s = new QGCViewModeSelection(this);
-//    setCentralWidget(s);
-//    show();
-//    enum MainWindow::CUSTOM_MODE mode = MainWindow::CUSTOM_MODE_WIFI;// = s->waitForInput();
-//    delete s;
-//    return mode;
-}

src/ui/main/QGCWelcomeMainWindow.h

@@ -17,7 +17,6 @@ public:
     explicit QGCWelcomeMainWindow(QWidget *parent = 0);
     ~QGCWelcomeMainWindow();
 
-    enum MainWindow::CUSTOM_MODE getCustomMode();
     bool getStoreSettings()
     {
         return storeSettings;