Merge branch 'master' into kf5

Authored by asturmlechner on Feb 12 2017, 5:09 PM.

Description

Merge branch 'master' into kf5

Merged Changes

CommitAuthorDetailsCommitted
5535be8635d3Alexis BALLIER/asturmlechner
Fix amarok build with LibOFA using ffmpeg 3+ 
Feb 12 2017
0feb6251925fRobert Marshall/aacid
Fix minor typo 
Feb 4 2017
2a8cb3785e50Yash Ladia/aacid
Fix Bug 302299 - Autoscrolling Lyrics are scrolling down if a song is rated via… 
Feb 4 2017
4bc124345e35l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Feb 4 2017
36e08238588cl10n daemon script
GIT_SILENT made messages (after extraction) 
Feb 4 2017
aeddcc759f08l10n daemon script
GIT_SILENT made messages (after extraction) 
Jan 24 2017
1ccf0a34d241l10n daemon script
Revert "SVN_SILENT made messages (after extraction)" 
Nov 19 2016
d7117d1ae271l10n daemon script
SVN_SILENT made messages (after extraction) 
Nov 19 2016
9fb00e5a9757Matěj Laitl
Fix Collection Browser auto-expand after search expanding too little 
Oct 16 2016