Merge branch 'master' into dvratil/osd

Authored by sebas on Jan 17 2018, 3:43 PM.

Description

Merge branch 'master' into dvratil/osd

Details

Committed
sebasJan 17 2018, 3:43 PM
Parents
R104:411c3c208f8d: Merge branch 'Plasma/5.12'
R104:09128524a22b: Initialize OsdManager on KDED start
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
411c3c208f8ddvratil
Merge branch 'Plasma/5.12' 
Jan 16 2018
25d030dd0db1D9903dvratil
KDED: respond to output being completely removed 
Jan 16 2018
b81e8351b369dvratil
Merge branch 'Plasma/5.12' 
Jan 16 2018
fd85ba8531a1D9902dvratil
KDED: restore output scale from config 
Jan 16 2018
3129f5089ef2D9902dvratil
KDED: restore output scale from config 
Jan 16 2018
969504b7197ajriddell
Update version number for 5.12.80 GIT_SILENT 
Jan 15 2018
8584cd96fcc9jriddell
Update version number for 5.11.95 GIT_SILENT 
Jan 15 2018
fc1cbc10fc4amlaurent
Remove obsolete reviewboardrc file 
Jan 5 2018
2d6ac7e7af78l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 20 2017