Brian Sweeney c4be23b841 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3623-common-files-optimize ...

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

2018-04-09 14:00:04 -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 'develop' of https://github.com/briangsweeney/autopsy into 3623-common-files-optimize

2018-04-09 14:00:04 -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

2018-01-03 14:43:27 -05:00

build.xml

use getdatadir for regression test

2018-03-29 14:43:29 -04:00

ivy.xml

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

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

ivysettings.xml

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

2018-01-09 12:04:51 +01:00

manifest.mf

added default fonts to the corecomponents installer

2018-02-27 10:43:00 -05:00

updates_ja.xml

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05:00