Cura/plugins/UM3NetworkPrinting/resources
Diego Prado Gesto 5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
2018-10-29 11:10:25 +01:00
..
qml Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-29 11:10:25 +01:00
svg Cleaned-up printe job info block 2018-09-27 13:40:46 +02:00