Merge branch 'develop' into features-3005
# Conflicts: # CellFrameDashboardGUI/DapServiceController.cpp # CellFrameDashboardGUI/DapServiceController.h # CellFrameDashboardGUI/qml.qrc # CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml # CellFrameDashboardService/DapServiceController.cpp # CellFrameDashboardService/DapServiceController.h # libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri # libdap-qt-ui-qml
No related branches found
No related tags found
Showing
- CellFrameDashboardService/DapServiceController.cpp 4 additions, 0 deletionsCellFrameDashboardService/DapServiceController.cpp
- CellFrameDashboardService/DapServiceController.h 2 additions, 0 deletionsCellFrameDashboardService/DapServiceController.h
- libCellFrameDashboardCommon/Handlers/DapCreateTransactionCommand.cpp 51 additions, 0 deletions...eDashboardCommon/Handlers/DapCreateTransactionCommand.cpp
- libCellFrameDashboardCommon/Handlers/DapCreateTransactionCommand.h 38 additions, 0 deletions...ameDashboardCommon/Handlers/DapCreateTransactionCommand.h
- libCellFrameDashboardCommon/Handlers/DapMempoolProcessCommand.cpp 43 additions, 0 deletions...rameDashboardCommon/Handlers/DapMempoolProcessCommand.cpp
- libCellFrameDashboardCommon/Handlers/DapMempoolProcessCommand.h 35 additions, 0 deletions...lFrameDashboardCommon/Handlers/DapMempoolProcessCommand.h
- libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri 4 additions, 0 deletionslibCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
- libdap-qt-ui-qml 1 addition, 1 deletionlibdap-qt-ui-qml
Please register or sign in to comment