mirror of
https://github.com/elisspace/autopsy.git
synced 2026-09-17 16:26:19 +00:00
Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3870-pure-callable # Conflicts: # Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResultRootNode.java # Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeValue.java # Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadata.java # Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadataBuilder.java # Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java # Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java # Core/src/org/sleuthkit/autopsy/corecomponents/MultiLayerTableFilterNode.java # Core/src/org/sleuthkit/autopsy/datamodel/InstanceCountNode.java # Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java # Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java