<table><tr><td style="">ngraham updated this revision to Diff 33452.<br />ngraham 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/D12333">View Revision</a></tr></table><br /><div><div><ul class="remarkup-list">

<li class="remarkup-list-item">Merge master</li>

<li class="remarkup-list-item">Remove custom styling</li>

</ul></div></div><br /><div><strong>REPOSITORY</strong><div><div>R241 KIO</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D12333?vs=32522&id=33452">https://phabricator.kde.org/D12333?vs=32522&id=33452</a></div></div><br /><div><strong>BRANCH</strong><div><div>move-sort-order-chooser-to-toolbar (branched from master)</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D12333">https://phabricator.kde.org/D12333</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>autotests/kfileplacesviewtest.cpp<br />

src/core/batchrenamejob.h<br />

src/core/connectionserver.h<br />

src/core/copyjob.h<br />

src/core/dataslave_p.h<br />

src/core/deletejob.h<br />

src/core/directorysizejob.h<br />

src/core/emptytrashjob.h<br />

src/core/filecopyjob.h<br />

src/core/filesystemfreespacejob.h<br />

src/core/forwardingslavebase.h<br />

src/core/hostinfo.cpp<br />

src/core/kcoredirlister.cpp<br />

src/core/kcoredirlister.h<br />

src/core/krecentdocument.cpp<br />

src/core/listjob.h<br />

src/core/mimetypejob.h<br />

src/core/mkdirjob.h<br />

src/core/mkpathjob.cpp<br />

src/core/mkpathjob.h<br />

src/core/multigetjob.h<br />

src/core/restorejob.h<br />

src/core/scheduler.cpp<br />

src/core/simplejob.h<br />

src/core/statjob.h<br />

src/core/tcpslavebase.h<br />

src/core/transferjob.h<br />

src/filewidgets/kdiroperator.cpp<br />

src/filewidgets/kdirsortfilterproxymodel.h<br />

src/filewidgets/kfilebookmarkhandler_p.h<br />

src/filewidgets/kfilecopytomenu.h<br />

src/filewidgets/kfilecustomdialog.h<br />

src/filewidgets/kfilefiltercombo.h<br />

src/filewidgets/kfileplacesmodel.cpp<br />

src/filewidgets/kfileplacesmodel.h<br />

src/filewidgets/kfileplacesview.cpp<br />

src/filewidgets/kfileplacesview.h<br />

src/filewidgets/kfilepreviewgenerator.cpp<br />

src/filewidgets/kfilewidget.cpp<br />

src/filewidgets/kfilewidget.h<br />

src/filewidgets/kimagefilepreview.h<br />

src/filewidgets/kpreviewwidgetbase.h<br />

src/filewidgets/kurlnavigator.cpp<br />

src/filewidgets/kurlnavigator.h<br />

src/filewidgets/kurlnavigatorbutton.cpp<br />

src/filewidgets/kurlnavigatordropdownbutton_p.h<br />

src/filewidgets/kurlnavigatormenu_p.h<br />

src/filewidgets/kurlnavigatorplacesselector_p.h<br />

src/filewidgets/kurlnavigatortogglebutton_p.h<br />

src/ioslaves/file/file_unix.cpp<br />

src/ioslaves/file/kauth/file.actions<br />

src/ioslaves/trash/kcmtrash.desktop<br />

src/pathhelpers_p.h<br />

src/urifilters/ikws/searchproviders/qt.desktop<br />

src/urifilters/ikws/searchproviders/qt4.desktop<br />

src/widgets/kpropertiesdialog.cpp</div></div></div><br /><div><strong>To: </strong>ngraham, Frameworks, Dolphin, VDG<br /><strong>Cc: </strong>abetts, jtamate, broulik, anemeth, rkflx, michaelh, bruns<br /></div>