fieldOfView 55af0af755 Merge branch 'master' into feature_print_monitoring ... # Conflicts: # resources/qml/Cura.qml		2016-06-24 14:55:12 +02:00
..
definitions	Removed extraneous space	2016-06-23 11:17:28 +02:00
i18n	Add translations for Initial Layer Z Overlap setting	2016-05-12 13:41:39 +02:00
images	Change splash-screen so it does not say "developer version", pending a release "real soon now"	2016-04-05 22:28:52 +02:00
materials	Remove non-xml material profiles	2016-06-02 08:10:55 +02:00
meshes	Add Mendel90 by Bo Herrmannsen	2016-06-16 13:17:41 +02:00
qml	Merge branch 'master' into feature_print_monitoring	2016-06-24 14:55:12 +02:00
quality	Determine readonly state from location in filesystem instead of a metadata property	2016-06-09 13:16:23 +02:00
shaders	Allow setting the diffuse_color with a uniform binding	2016-06-14 11:05:50 +02:00
themes/cura	Merge branch 'master' into feature_print_monitoring	2016-06-24 14:55:12 +02:00
variants	Removed test files	2016-06-22 17:04:31 +02:00