Arjen Hiemstra 82c7dd8d0a Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings ... * 'master' of github.com:ultimaker/Cura: 15.10 restyling of the sidebar header		2015-09-01 18:04:06 +02:00
..
i18n	Update Cura translation file with the correct version	2015-06-30 17:29:40 +02:00
images	Add profile for machine 3DMaker Starter	2015-08-10 21:54:38 +07:00
machines	Change "active_if" to "enabled" for all Wireframe settings	2015-09-01 17:28:58 +02:00
meshes	Merge pull request #247 from KJHamblin/master	2015-08-13 09:16:07 +02:00
profiles	Fix normal profile and add a very basic High Quality profile	2015-08-27 09:36:52 +02:00
qml	Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings	2015-09-01 18:04:06 +02:00
themes/cura	15.10 restyling of the sidebar header	2015-09-01 17:26:35 +02:00