<table><tr><td style="">progwolff updated this revision to Diff 18437.<br />progwolff added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D7431" rel="noreferrer">View Revision</a></tr></table><br /><div><div><ul class="remarkup-list">
<li class="remarkup-list-item">Merge branch 'master' of git://anongit.kde.org/calligra</li>
<li class="remarkup-list-item">fix desktop file</li>
</ul></div></div><br /><div><strong>REPOSITORY</strong><div><div>R8 Calligra</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D7431?vs=18430&id=18437" rel="noreferrer">https://phabricator.kde.org/D7431?vs=18430&id=18437</a></div></div><br /><div><strong>BRANCH</strong><div><div>master</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D7431" rel="noreferrer">https://phabricator.kde.org/D7431</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CalligraProducts.cmake<br />
filters/words/rtf/import/CMakeLists.txt<br />
filters/words/rtf/import/OkularRtfGeneratorPlugin.cpp<br />
filters/words/rtf/import/libokularGenerator_rtf.json<br />
filters/words/rtf/import/okularApplication_rtf_calligra.desktop<br />
filters/words/rtf/import/okularRtf_calligra.desktop</div></div></div><br /><div><strong>To: </strong>progwolff, Calligra: 3.0, Okular<br /><strong>Cc: </strong>ltoscano, vandenoever<br /></div>