From a6568dc4685f56d190d48fb10e7afd2f84cbb9fc Mon Sep 17 00:00:00 2001 From: Mike LaBranche Date: Sat, 7 Jul 2012 12:47:07 -0700 Subject: [PATCH] merge next conflict resolution --- .../openpilotgcs/src/plugins/config/configvehicletypewidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp index 613115378..01de2d1b0 100644 --- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp @@ -119,7 +119,6 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi QStringList airframeTypes; airframeTypes << "Fixed Wing" << "Multirotor" << "Helicopter" << "Ground" << "Custom"; m_aircraft->aircraftType->addItems(airframeTypes); - m_aircraft->aircraftType->setCurrentIndex(1); //Set default vehicle to MultiRotor m_aircraft->airframesWidget->setCurrentIndex(1); // Force the tab index to match