Merge branch 'Plasma/5.7'

Authored by davidedmundson on Aug 1 2016, 12:50 PM.

Description

Merge branch 'Plasma/5.7'

Details

Committed
davidedmundsonAug 1 2016, 12:50 PM
Parents
R119:79f842066d05: Remove dead code
R119:8a152cb7a663: Undo trash support.
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
79f842066d05D2241davidedmundson
Remove dead code 
Aug 1 2016
30ed2b912783davidedmundson
Anchors in a layout item is always wrong 
Aug 1 2016
14d48bac5f95D2239davidedmundson
Workaround searching lockup 
Aug 1 2016
61389485e814mart
correct typo 
Jul 29 2016
3b123057a01bmart
use desktopsForActivty(currentActivity()); 
Jul 29 2016
89cb478eb205mart
don't create activities by ourselves 
Jul 29 2016
28a60da51819l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jul 28 2016