Merge branch 'Plasma/5.12'

Authored by broulik on Feb 15 2018, 9:51 AM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
ca059f3362c7broulik
[Media Frame] Use Label instead of Text 
Feb 15 2018
47792e327316 jriddell
Update version number for 5.12.1 GIT_SILENT 
Feb 13 2018
874ea747d446l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Feb 4 2018
1dd19f51f40el10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Feb 2 2018
daaa7cd652c8bshah
Update version number for 5.12.0 GIT_SILENT 
Feb 1 2018
9f80eb07481el10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Feb 1 2018