6 commits

Author	SHA1	Message	Date
Ghostkeeper	d458fcde5c	Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" ... This reverts commit e07e7bc9e7. Contributes to issue CURA-4414.	2017-10-05 10:58:49 +02:00
Ghostkeeper	e07e7bc9e7	Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" ... This reverts commit b62c19206f, reversing changes made to 104926c6ed. Contributes to issue CURA-4414.	2017-10-05 10:28:54 +02:00
Ghostkeeper	1d7792861d	Merge branch '3.0' ... Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.	2017-10-02 17:40:24 +02:00
Simon Edwards	eb85c28c10	CL-476 "View print jobs" and "View printers" buttons should be blue ... Subtask of CL-457 Cura plugin: primary visual improvements	2017-09-30 11:46:55 +02:00
Ghostkeeper	d999d1c7f2	Remove extra space ... Just a typo. Contributes to issue CURA-4341.	2017-09-27 17:32:47 +02:00
Simon Edwards	85efd9249c	Add in all of the changes for Cura Connect ... CURA-4376	2017-09-27 10:29:48 +02:00