autopsy

mirror of https://github.com/elisspace/autopsy.git synced 2026-09-20 17:51:48 +00:00

Files

T

Andrew Ziehl ce847c2c1b Merge branch 'common-files-feature' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSourcesCommonFilesAlgorithm.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadata.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadataBuilder.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/FileInstanceMetadata.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Md5Metadata.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java

2018-05-01 16:54:14 -07:00

nbproject

Merge in custom-release-may-2018 and resolve conflicts

2018-05-01 10:58:55 -04:00

src/org/sleuthkit/autopsy

Merge branch 'common-files-feature' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer

2018-05-01 16:54:14 -07:00

test/qa-functional/src/org/sleuthkit/autopsy

Resolve merge conflict for custom-release-may-2018 branch

2018-04-27 17:36:33 -04:00

autopsy-updates.xml

…