Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
dSS - digitalSTROM Server
dss-mainline
Commits
c2fb7c7d
Commit
c2fb7c7d
authored
5 years ago
by
Branislav Katreniak
Browse files
Options
Download
Plain Diff
Merge branch 'cherry-pick-
ec9c8606
' into 'R2002'
Cherry pick 'vdc_states_fix' See merge request
!1987
parents
20b09c6a
13dd481d
R2002
1.16.4
1.16.4-beta06
1.16.4-beta05
1.16.4-beta04
1.16.4-beta03
1.16.4-beta02
1 merge request
!1987
Cherry pick 'vdc_states_fix'
Changes
11
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
src/device-info-test.cpp
+2
-2
src/device-info-test.cpp
src/device-info.cpp
+1
-1
src/device-info.cpp
src/device-info.h
+1
-1
src/device-info.h
src/ds-model-test.cpp
+2
-2
src/ds-model-test.cpp
src/ds-model.cpp
+1
-1
src/ds-model.cpp
src/model/busscanner.cpp
+1
-1
src/model/busscanner.cpp
src/model/device-data.h
+2
-2
src/model/device-data.h
src/model/device-test.cpp
+23
-0
src/model/device-test.cpp
src/model/device.cpp
+16
-5
src/model/device.cpp
src/model/device.h
+3
-2
src/model/device.h
src/model/modelmaintenance.cpp
+3
-0
src/model/modelmaintenance.cpp
with
55 additions
and
17 deletions
+55
-17
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets