Skip to content
Snippets Groups Projects
Commit 750ba747 authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'features-2699' into 'master' 

[+] Submodule added.

See merge request !42
parents aa897919 9fdcfd2b
No related branches found
No related tags found
1 merge request!42[+] Submodule added.
Pipeline #1290 passed with stage
in 22 minutes and 14 seconds
Hide whitespace changes
Inline Side-by-side
CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+ 1
− 0
View file @ 750ba747
...@@ -119,6 +119,7 @@ HEADERS += \ ...@@ -119,6 +119,7 @@ HEADERS += \
include (../libdap/libdap.pri) include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri) include (../libdap-crypto/libdap-crypto.pri)
include (../libdap-qt/libdap-qt.pri) include (../libdap-qt/libdap-qt.pri)
include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri)
include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri) include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri) include (../DapRPCProtocol/DapRPCProtocol.pri)
......
CellFrameDashboardService/CellFrameDashboardService.pro
+ 2
− 0
View file @ 750ba747
...@@ -69,6 +69,8 @@ HEADERS += \ ...@@ -69,6 +69,8 @@ HEADERS += \
include (../libdap/libdap.pri) include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri) include (../libdap-crypto/libdap-crypto.pri)
include (../libdap-qt/libdap-qt.pri) include (../libdap-qt/libdap-qt.pri)
include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri)
include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri) include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri) include (../DapRPCProtocol/DapRPCProtocol.pri)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment