diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2019-12-23 18:26:25 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2019-12-23 18:26:25 +0300 |
| commit | 8a9b7912984a3d4a5fed23ae6caf3c62cde7c9f5 (patch) | |
| tree | ff4d870038f39aece3cd2dd97eb9b1e78a5b85ee /plugins/MachineSettingsAction | |
| parent | ce5f7ce82189f49e72fabd8365cf219f97e1a07d (diff) | |
| parent | 8218d62e20f0843c252d510b0eb313c72e88268b (diff) | |
Merge branch '4.4'
Conflicts:
cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
Diffstat (limited to 'plugins/MachineSettingsAction')
0 files changed, 0 insertions, 0 deletions