fieldOfView dbabf3bda9 Merge branch 'master' into feature_preheat_extruder ... # Conflicts: # cura/PrinterOutput/ExtruderOutputModel.py # cura/PrinterOutput/PrinterOutputModel.py		2018-03-15 11:21:37 +01:00
..
fonts	CURA-4790 Change font to Noto Sans	2018-02-08 17:23:14 +01:00
icons	Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles	2018-03-14 13:25:59 +01:00
images	Fix letter 'r' alignment in logo	2017-09-11 18:05:19 +02:00
styles.qml	Change Math.floor to Math.round as a last try to fix garbled fonts	2018-02-14 09:28:47 +01:00
theme.json	Merge branch 'master' into feature_preheat_extruder	2018-03-15 11:21:37 +01:00