mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-09 20:46:07 +01:00
78a4241ba2
Conflicts: ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp ground/openpilotgcs/src/plugins/config/configinputwidget.cpp ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp |
||
---|---|---|
.. | ||
qmlview_dependencies.pri | ||
QMLView.pluginspec | ||
qmlview.pro | ||
qmlviewgadget.cpp | ||
qmlviewgadget.h | ||
qmlviewgadgetconfiguration.cpp | ||
qmlviewgadgetconfiguration.h | ||
qmlviewgadgetfactory.cpp | ||
qmlviewgadgetfactory.h | ||
qmlviewgadgetoptionspage.cpp | ||
qmlviewgadgetoptionspage.h | ||
qmlviewgadgetoptionspage.ui | ||
qmlviewgadgetwidget.cpp | ||
qmlviewgadgetwidget.h | ||
qmlviewplugin.cpp | ||
qmlviewplugin.h |