autopsy-flatpak

mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00

History

Andrew Ziehl 86b61f4a02 Merge branch '3602-common-case-files_r2' of https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java

2018-04-09 13:56:11 -06:00

nbproject

Merge remote-tracking branch 'upstream/develop' into cvt-graph-view

2018-03-14 16:18:47 +01:00

src/org/sleuthkit/autopsy

Merge branch '3602-common-case-files_r2' of https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2

2018-04-09 13:56:11 -06:00

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

Merge pull request #3637 from rishwanth1995/datapathfortests

2018-04-02 13:44:04 -04:00

autopsy-updates.xml

3386: Update the files permission from 755 to 644