progwolff updated this revision to Diff 38828. progwolff added a comment.
- Merge branch 'master' of git://anongit.kde.org/plasma-desktop into arcpatch-D12925 - Merge branch 'master' of git://anongit.kde.org/plasma-desktop into arcpatch-D12925 - also drop vendor-default-option for subpixel and hint REPOSITORY R119 Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D12925?vs=38764&id=38828 BRANCH arcpatch-D12925 REVISION DETAIL https://phabricator.kde.org/D12925 AFFECTED FILES kcms/fonts/fonts.cpp kcms/fonts/fonts.h kcms/fonts/kxftconfig.cpp kcms/fonts/kxftconfig.h kcms/fonts/package/contents/ui/main.qml kcms/fonts/previewimageprovider.cpp To: progwolff, ngraham, #plasma Cc: rkflx, ngraham, mart, plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol
