millmanorama 765cff0622 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/services/Services.java
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java

2018-12-27 15:19:27 +01:00

..

nbproject

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

2018-12-27 15:19:27 +01:00

src/org/sleuthkit/autopsy/recentactivity

fix merge

2018-11-27 11:16:58 +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