nmel updated this revision to Diff 31350. nmel added a comment.
Updated the merge. REPOSITORY R167 Krusader CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11898?vs=31192&id=31350 BRANCH bookmark-search-merge_arc REVISION DETAIL https://phabricator.kde.org/D11898 AFFECTED FILES doc/bookmarks.docbook doc/konfigurator.docbook krusader/BookMan/krbookmark.cpp krusader/BookMan/krbookmark.h krusader/BookMan/krbookmarkbutton.cpp krusader/BookMan/krbookmarkhandler.cpp krusader/BookMan/krbookmarkhandler.h krusader/Konfigurator/kgpanel.cpp krusader/krusader.cpp To: nmel, #krusader, martinkostolny, rade, asensi, gengisdave, abika Cc: kde-doc-english, nmel, mjanczara, miroslavm, janlepper, abika, martinkostolny, asensi, gengisdave, andreaska