Merging stable into master

[David Edmundson]

Hey,

There's a messed up merge commit which has damaged some .desktop files in
plasma-workspace leaving merge markers (<<<<HEAD) in the middle of it.

.desktop files are almost always the result of translations; if you get a
message about conflicts in .desktop files the simplest fix is:

git checkout --ours nameOfEachDesktopFile.desktop
git add nameOfEachDesktopFile.desktop
git commit

The original bad merge is now fixed, the above instructions are to make
sure it doesn't happen again.

Regards

David
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20141001/facf71ce/attachment.html>