Merge branch 'master' into mart/static

Authored by mart on Jan 15 2018, 3:25 PM.

Description

Merge branch 'master' into mart/static

Merged Changes

CommitAuthorDetailsCommitted
d6f13a1c25bbl10n daemon script
GIT_SILENT Upgrade KF5 version to 5.43.0. 
Jan 15 2018
52e87d2c96dbD8726broulik
[ScrollView] Scroll one page with Shift+wheel 
Jan 15 2018
37e134b62527D8725broulik
[PageRow] Navigate between levels with mouse back/forward buttons 
Jan 15 2018
6c8b2cc8f103l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 13 2018
69885decbc8eD9304apol
Get the padding into the header 
Jan 12 2018
811d023b5198D9816leinir
Ensure DesktopIcon paints with the correct aspect ratio 
Jan 12 2018
95417dc1f9bemart
no custom opacity 
Jan 12 2018
92c2d4b41170l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 12 2018
a71ed1c5d084mart
solve conflict of property called action 
Jan 10 2018
f28d42b3fb1fl10n daemon script
GIT_SILENT Upgrade ECM and KF5 version requirements for 5.42.0 release. 
Jan 5 2018
09da1cca814eD8896janmulder/davidedmundson
Add recently added file to .qrc 
Jan 2 2018
3606ef16375fmart
keep the flickable interactive 
Dec 26 2017