Merge branch 'master' into CURA-8943_tool_panel_icon_size

Browse source

# Conflicts:
#	resources/qml/ToolTip.qml

...

This commit is contained in:

j.delarago 2022-03-07 12:46:36 +01:00

parent 64e3e8b31d 24fc1ae2a2

commit f58411d086

28 changed files with 320 additions and 157 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

resources/qml/ToolTip.qml Normal file

Unescape Escape View file