michaelh updated this revision to Diff 28088. michaelh marked an inline comment as done. michaelh edited the summary of this revision. michaelh added a comment.
- Merge branch 'flexible-docid' of git://anongit.kde.org/baloo into aliases - Correct indentation REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10825?vs=28001&id=28088 BRANCH aliases (branched from flexible-docid) REVISION DETAIL https://phabricator.kde.org/D10825 AFFECTED FILES src/codecs/coding.h src/codecs/positioncodec.cpp src/codecs/postingcodec.cpp src/codecs/postingcodec.h src/engine/andpostingiterator.cpp src/engine/andpostingiterator.h src/engine/document.cpp src/engine/document.h src/engine/documentdatadb.cpp src/engine/documentdatadb.h src/engine/documentdb.cpp src/engine/documentdb.h src/engine/documentiddb.cpp src/engine/documentiddb.h src/engine/documenttimedb.cpp src/engine/documenttimedb.h src/engine/documenturldb.cpp src/engine/documenturldb.h src/engine/idfilenamedb.cpp src/engine/idfilenamedb.h src/engine/idtreedb.cpp src/engine/idtreedb.h src/engine/idutils.h src/engine/mtimedb.cpp src/engine/mtimedb.h src/engine/orpostingiterator.cpp src/engine/orpostingiterator.h src/engine/phraseanditerator.cpp src/engine/phraseanditerator.h src/engine/positiondb.cpp src/engine/positioninfo.h src/engine/postingdb.cpp src/engine/postingdb.h src/engine/postingiterator.cpp src/engine/postingiterator.h src/engine/transaction.cpp src/engine/transaction.h src/engine/vectorpositioninfoiterator.cpp src/engine/vectorpositioninfoiterator.h src/engine/vectorpostingiterator.cpp src/engine/vectorpostingiterator.h src/engine/writetransaction.cpp src/engine/writetransaction.h src/file/extractor/app.cpp src/file/extractor/app.h src/file/extractor/autotests/iohandlertest.cpp src/file/extractor/iohandler.cpp src/file/extractor/iohandler.h src/file/extractor/result.cpp src/file/extractor/result.h src/file/extractorprocess.cpp src/file/extractorprocess.h src/file/filecontentindexer.cpp src/file/filecontentindexerprovider.cpp src/file/filecontentindexerprovider.h src/file/indexcleaner.cpp src/file/metadatamover.cpp src/file/modifiedfileindexer.cpp src/file/unindexedfileindexer.cpp src/file/unindexedfileiterator.cpp src/lib/file.cpp src/lib/searchstore.cpp src/tools/balooctl/main.cpp src/tools/balooctl/statuscommand.cpp src/tools/balooshow/main.cpp To: michaelh, adridg, #baloo, #frameworks Cc: ngraham, alexeymin, ashaposhnikov, michaelh, spoorun, nicolasfella