progwolff updated this revision to Diff 18437. progwolff added a comment.
- Merge branch 'master' of git://anongit.kde.org/calligra - fix desktop file REPOSITORY R8 Calligra CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D7431?vs=18430&id=18437 BRANCH master REVISION DETAIL https://phabricator.kde.org/D7431 AFFECTED FILES CalligraProducts.cmake filters/words/rtf/import/CMakeLists.txt filters/words/rtf/import/OkularRtfGeneratorPlugin.cpp filters/words/rtf/import/libokularGenerator_rtf.json filters/words/rtf/import/okularApplication_rtf_calligra.desktop filters/words/rtf/import/okularRtf_calligra.desktop To: progwolff, #calligra:_3.0, #okular Cc: ltoscano, vandenoever
