Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ...
Conflicts:
plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
2018-11-26 13:43:20 +01:00
2018-11-06 13:31:04 +01:00
2018-10-03 22:00:24 +02:00
2018-11-15 09:38:14 +01:00
2018-10-09 12:04:53 +02:00
2018-10-10 14:28:50 +02:00
2018-08-27 13:59:00 +02:00
2018-10-15 15:12:42 +02:00
2018-10-18 14:30:33 +02:00
2018-09-27 13:58:06 +02:00
2018-08-27 13:59:00 +02:00
2018-08-27 13:59:00 +02:00
2018-10-24 16:14:05 +02:00
2018-09-28 12:01:20 +02:00
2018-10-18 14:30:33 +02:00
2018-11-13 12:05:14 +01:00
2018-10-29 10:40:25 +01:00
2018-10-18 14:30:33 +02:00
2018-10-29 11:28:08 +01:00
2018-10-26 11:01:46 +02:00
2018-11-15 15:55:08 +01:00
2018-11-26 13:43:20 +01:00
2018-11-22 09:37:36 +01:00
2018-10-03 22:00:24 +02:00
2018-11-22 11:08:46 +01:00
2018-10-03 22:00:24 +02:00
2018-10-29 14:54:42 +01:00
2018-08-27 13:59:00 +02:00
2018-11-20 13:25:15 +01:00
2018-10-04 15:54:22 +02:00
2018-10-18 14:30:33 +02:00
2018-11-22 16:11:06 +01:00
2018-10-19 14:38:25 +02:00
2018-10-18 14:30:33 +02:00
2018-11-22 11:36:32 +01:00
2018-08-27 13:59:00 +02:00
2018-10-03 22:00:24 +02:00
2018-08-27 13:59:00 +02:00
826044da7e