millmanorama 0131d3b15d Merge remote-tracking branch 'upstream/develop' into merge-develop-into-timeline ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java

2018-11-21 21:11:45 +01:00

..

nbproject

Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr

2018-11-08 16:23:54 +01:00

src/org/sleuthkit/autopsy/recentactivity

Merge remote-tracking branch 'upstream/develop' into merge-develop-into-timeline

2018-11-21 21:11:45 +01:00

build.xml

reduce verbosity of ant build in travis

2018-04-11 11:48:42 -04:00

ivy.xml

3386: Update the files permission from 755 to 644

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

ivysettings.xml

3386: Update the files permission from 755 to 644

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

manifest.mf

Module version updates for release 4.8.0

2018-07-30 11:24:54 -04:00