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

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSourcesCommonFilesAlgorithm.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchResultsViewerTable.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Md5Node.java
#	Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java

2018-06-27 11:52:43 -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 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge

2018-06-27 11:52:43 -06:00

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

Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation

2018-06-21 15:09:13 -06:00

autopsy-updates.xml

…

build.xml

Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation

2018-06-21 15:09:13 -06:00

ivy.xml

…

ivysettings.xml

…

manifest.mf

Update version numbers for rlease 4.7.0

2018-05-02 20:06:37 -04:00

updates_ja.xml

…