Diego Prado Gesto b8d442a1ac Merge pull request #3760 from fieldOfView/fix_missing_units ... Add some missing units to machine settings		2018-05-04 15:07:09 +02:00
..
definitions	Merge pull request #3760 from fieldOfView/fix_missing_units	2018-05-04 15:07:09 +02:00
extruders	Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile	2018-04-23 21:05:34 -07:00
i18n	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-24 12:43:49 +02:00
images	Add Ultimaker S5 resources	2018-04-23 11:27:13 +02:00
meshes	Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile	2018-04-23 21:05:34 -07:00
qml	Fix: filenames cut by first dot, remove only file extension because file might have dot in name	2018-05-02 17:17:45 +02:00
quality	Merge pull request #3699 from Ultimaker/M&P-Setting-Optimization	2018-05-04 09:43:30 +02:00
setting_visibility	Merge branch 'master' into feature_setting_visibility_profiles	2018-03-09 15:45:24 +01:00
shaders	GLES shader fixes	2018-03-29 21:07:51 +02:00
themes	Move toolbox button style into theme	2018-05-04 10:41:45 +02:00
variants	Update the rest to version 5	2018-05-02 14:07:24 +02:00