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

[Thomas Friedrichsmeier]

Git commit 209de6cb4f069b5c5f7a5d34e2fd0d8083951f31 by Thomas Friedrichsmeier.
Committed on 04/06/2017 at 18:53.
Pushed by tfry into branch 'frameworks'.

Merge branch 'master' into frameworks

M  +107  -110  doc/rkwardplugins/index.docbook
R  +1    -0    rkward/org.kde.rkward-open.desktop
R  +1    -0    rkward/org.kde.rkward.desktop
M  +3    -1    rkward/plugin/rkformula.cpp

https://commits.kde.org/rkward/209de6cb4f069b5c5f7a5d34e2fd0d8083951f31

diff --cc rkward/org.kde.rkward.desktop
index adb468eb,4b382a89..a1fb95c1
mode 100755,100644..100755
--- a/rkward/org.kde.rkward.desktop
+++ b/rkward/org.kde.rkward.desktop