Merge branch 'master' into frameworks

Review Request #127798 - Created April 30, 2016 and submitted

Information
Martin Walch
lskat
frameworks
Reviewers
Kdegames

The master branch and the frameworks branch have diverged quite a lot in terms of diff size.

This merges the changes from master into frameworks.

There were a lot of conflicts. Hopefully I got them all right.

Compiled against KF 5.21.

Crashes for me at runtime when initializing KCrash (how ironic), but this also happens with the current state of frameworks before the merge.

Frederik Schwarzer
Martin Walch
Review request changed

Status: Closed (submitted)

Loading...