Skip to content
GitLab
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
b91378c2
Commit
b91378c2
authored
3 years ago
by
andreas.fenkart
Browse files
Options
Download
Plain Diff
Merge branch 'MR_kl300_icon_path' into 'master'
Mr kl300 icon path See merge request
!2669
parents
a00e30c0
7dbb973d
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
data/images.list
+9
-1
data/images.list
data/images/kl300_black_black.png
+0
-0
data/images/kl300_black_black.png
data/images/kl300_black_blue.png
+0
-0
data/images/kl300_black_blue.png
data/images/kl300_black_cyan.png
+0
-0
data/images/kl300_black_cyan.png
data/images/kl300_black_green.png
+0
-0
data/images/kl300_black_green.png
data/images/kl300_black_grey.png
+0
-0
data/images/kl300_black_grey.png
data/images/kl300_black_magenta.png
+0
-0
data/images/kl300_black_magenta.png
data/images/kl300_black_red.png
+0
-0
data/images/kl300_black_red.png
data/images/kl300_black_white.png
+0
-0
data/images/kl300_black_white.png
data/images/kl300_black_yellow.png
+0
-0
data/images/kl300_black_yellow.png
data/images/kl300_grey.png
+0
-0
data/images/kl300_grey.png
src/model/buttonmanipulator.cpp
+1
-0
src/model/buttonmanipulator.cpp
src/model/device-mock-test.cpp
+2
-1
src/model/device-mock-test.cpp
src/model/device.cpp
+9
-2
src/model/device.cpp
with
21 additions
and
4 deletions
+21
-4
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
