Cura/resources/profiles/general
Ghostkeeper 0684cee681 Merge branch '2.1'
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
2016-04-04 18:49:09 +02:00
..
High+Quality.cfg Major cleanup for profiles 2016-03-18 14:18:19 +01:00
Low+Quality.cfg Merge branch '2.1' 2016-04-04 18:49:09 +02:00
Normal+Quality.cfg Merge branch '2.1' 2016-04-04 18:49:09 +02:00
Ulti+Quality.cfg Merge branch '2.1' 2016-04-04 18:49:09 +02:00