autopsy-flatpak

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

History

Brian Sweeney d8b4fc878e Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResultRootNode.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java

2018-07-23 15:28:10 -06:00

nbproject

Merge pull request #3837 from APriestman/2823_tskLayerTest

2018-06-20 12:06:23 -04:00

src/org/sleuthkit/autopsy

Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge

2018-07-23 15:28:10 -06:00

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

Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge

2018-07-23 15:28:10 -06:00

autopsy-updates.xml

3386: Update the files permission from 755 to 644