<table><tr><td style="">simgunz updated this revision to Diff 69380.<br />simgunz 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/D15580">View Revision</a></tr></table><br /><div><div><ul class="remarkup-list">
<li class="remarkup-list-item">Merge remote-tracking branch 'origin/master' into new-annotation-toolbar_ToggleActionMenu</li>
</ul></div></div><br /><div><strong>REPOSITORY</strong><div><div>R223 Okular</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D15580?vs=69379&id=69380">https://phabricator.kde.org/D15580?vs=69379&id=69380</a></div></div><br /><div><strong>BRANCH</strong><div><div>new-annotation-toolbar_ToggleActionMenu</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D15580">https://phabricator.kde.org/D15580</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CMakeLists.txt<br />
conf/dlgannotations.cpp<br />
conf/dlgannotationsbase.ui<br />
conf/editannottooldialog.cpp<br />
conf/editannottooldialog.h<br />
conf/okular.kcfg<br />
okular.upd<br />
part.cpp<br />
part.h<br />
part.rc<br />
shell/shell.rc<br />
ui/annotationactionhandler.cpp<br />
ui/annotationactionhandler.h<br />
ui/annotationwidgets.cpp<br />
ui/annotationwidgets.h<br />
ui/data/CMakeLists.txt<br />
ui/data/tools.xml<br />
ui/data/toolsQuick.xml<br />
ui/pageview.cpp<br />
ui/pageview.h<br />
ui/pageviewannotator.cpp<br />
ui/pageviewannotator.h<br />
ui/pageviewutils.cpp<br />
ui/pageviewutils.h<br />
ui/side_reviews.cpp<br />
ui/toggleactionmenu.cpp<br />
ui/toggleactionmenu.h<br />
ui/toolaction.cpp<br />
ui/toolaction.h</div></div></div><br /><div><strong>To: </strong>simgunz, Okular, VDG, ngraham<br /><strong>Cc: </strong>kde-doc-english, andreashurka, yurchor, trickyricky26, simgunz, ltoscano, cfeck, aacid, davidhurka, knambiar, ngraham, tobiasdeiminger, okular-devel, johnzh, andisa, siddharthmanthan, maguirre, gennad, fbampaloukas, joaonetto, kezik, tfella, skadinna, darcyshen<br /></div>