Ann Priestman 23f46bfda0 Merge remote-tracking branch 'upstream/develop' into 3879_userMetrics ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/healthmonitor/EnterpriseHealthMonitor.java

2018-06-08 16:03:54 -04:00

..

nbproject

Merge in custom-release-may-2018 branch and resolve conflicts

2018-05-07 16:08:40 -04:00

src/org/sleuthkit/autopsy

Merge remote-tracking branch 'upstream/develop' into 3879_userMetrics

2018-06-08 16:03:54 -04:00

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

lower accessibility

2018-05-25 09:05:30 -06:00

autopsy-updates.xml

3386: Update the files permission from 755 to 644

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

build.xml

Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests

2018-05-24 08:44:36 -06: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

Update version numbers for rlease 4.7.0

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

updates_ja.xml

3386: Update the files permission from 755 to 644

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