Merge remote-tracking branch 'upstream/master'

Authored by mkacej on Apr 3 2018, 4:24 PM.

Description

Merge remote-tracking branch 'upstream/master'

merge with upstream

Details

Committed
mkacejApr 3 2018, 4:24 PM
Parents
R116:0845f2f6ed86: more reafactoring
R116:f97c06cda551: Require NM 1.0.0 and newer
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
f97c06cda551jgrulich
Require NM 1.0.0 and newer 
Mar 29 2018
2583b4232e87D11550mart
use the bundled variant of installpackage 
Mar 21 2018
3cf9bddaf82dl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 6 2018
3d94a25a9186jgrulich
Merge branch 'Plasma/5.12' 
Mar 5 2018
0267a6a016b3jgrulich
Use ScrollView from QtQuickControls 
Feb 23 2018
9b0e6e562504jriddell
Update version number for 5.12.2 GIT_SILENT 
Feb 20 2018
6a21b80d9cf3jriddell
Update version number for 5.12.1 GIT_SILENT 
Feb 13 2018
cdc9c59a903ebshah
Update version number for 5.12.0 GIT_SILENT 
Feb 1 2018
66c8db798abfl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 28 2018
616bdb89f7e7l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 23 2018
a2e61a3c1c29l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 22 2018