autopsy-flatpak

mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00

History

Andrew Ziehl 734b4ebe6e Merge branch '3700-3730-3731-3732-3639-roundup' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.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/DataResultPanel.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java

2018-05-01 14:40:46 -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 '3700-3730-3731-3732-3639-roundup' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer

2018-05-01 14:40:46 -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

3386: Update the files permission from 755 to 644