Cura/resources/quality/tizyx
Ghostkeeper cf9f97e897
Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> Both had a version upgrade implementation.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py -> Both had a version upgrade implementation.
2019-06-12 13:03:05 +02:00
..
tizyx_evy Increment setting_version to 8 2019-06-12 09:09:41 +02:00
tizyx_evy_dual Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower 2019-06-12 13:03:05 +02:00
tizyx_k25 Increment setting_version to 8 2019-06-12 09:09:41 +02:00