Merge branch 'master' into bugs-2797 (6208cdc1) · Commits · cellframe / cellframe-dashboard · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cellframe-dashboard
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6208cdc1

Commit 6208cdc1 authored 5 years ago by Evgenii Tagiltsev

Downloads
- Plain Diff

Merge branch 'master' into bugs-2797

parents f50e71a7 2c7f7f7a

No related branches found

No related tags found

2 merge requests!65Bugs 2797,!58Bugs 2797

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CellFrameDashboardGUI/main.cpp 1 addition, 1 deletion

CellFrameDashboardGUI/main.cpp
CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml 1 addition, 1 deletion

...DashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml 3 additions, 3 deletions

CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml 1 addition, 1 deletion

...DashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml

with 6 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment