rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-963 fixed bad merge

Browse Source
This commit is contained in:
Philippe Renon 2013-12-07 17:36:14 +01:00
parent 17c9c8d8b0
commit 853174b4ca
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
View File

@ -70,8 +70,7 @@ SOURCES += mainwindow.cpp \
uavgadgetdecorator.cpp \ uavgadgetdecorator.cpp \
workspacesettings.cpp \ workspacesettings.cpp \
uavconfiginfo.cpp \ uavconfiginfo.cpp \
authorsdialog.cpp \ aboutdialog.cpp \
telemetrymonitorwidget.cpp
HEADERS += mainwindow.h \ HEADERS += mainwindow.h \
tabpositionindicator.h \ tabpositionindicator.h \
@ -132,7 +131,7 @@ HEADERS += mainwindow.h \
uavconfiginfo.h \ uavconfiginfo.h \
authorsdialog.h \ authorsdialog.h \
iconfigurableplugin.h \ iconfigurableplugin.h \
telemetrymonitorwidget.h aboutdialog.h
FORMS += dialogs/settingsdialog.ui \ FORMS += dialogs/settingsdialog.ui \
dialogs/shortcutsettings.ui \ dialogs/shortcutsettings.ui \