mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-18 08:54:15 +01:00
OP-963 fixed bad merge
This commit is contained in:
parent
17c9c8d8b0
commit
853174b4ca
@ -70,8 +70,7 @@ SOURCES += mainwindow.cpp \
|
||||
uavgadgetdecorator.cpp \
|
||||
workspacesettings.cpp \
|
||||
uavconfiginfo.cpp \
|
||||
authorsdialog.cpp \
|
||||
telemetrymonitorwidget.cpp
|
||||
aboutdialog.cpp \
|
||||
|
||||
HEADERS += mainwindow.h \
|
||||
tabpositionindicator.h \
|
||||
@ -132,7 +131,7 @@ HEADERS += mainwindow.h \
|
||||
uavconfiginfo.h \
|
||||
authorsdialog.h \
|
||||
iconfigurableplugin.h \
|
||||
telemetrymonitorwidget.h
|
||||
aboutdialog.h
|
||||
|
||||
FORMS += dialogs/settingsdialog.ui \
|
||||
dialogs/shortcutsettings.ui \
|
||||
|
Loading…
x
Reference in New Issue
Block a user