Skip to content
Snippets Groups Projects
Select Git revision
0 results
Blame History Permalink
  • littletux89@gmail.com's avatar
    Merge branch 'develop' into features-3005 · 8a2fee9b
    littletux89@gmail.com authored 
    # 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
    8a2fee9b