[rkward/frameworks] rkward: Merge branch 'master' into frameworks

[Thomas Friedrichsmeier]

Git commit 9eb25564fec1baf9b5fc4f802e4d2a80c1b15763 by Thomas Friedrichsmeier.
Committed on 28/03/2018 at 18:42.
Pushed by tfry into branch 'frameworks'.

Merge branch 'master' into frameworks

R  +3    -0    rkward/org.kde.rkward-open.desktop
R  +3    -0    rkward/org.kde.rkward.desktop

https://commits.kde.org/rkward/9eb25564fec1baf9b5fc4f802e4d2a80c1b15763

diff --cc rkward/org.kde.rkward.desktop
index a1fb95c1,73540fce..a3517347
mode 100755,100644..100755
--- a/rkward/org.kde.rkward.desktop
+++ b/rkward/org.kde.rkward.desktop