millmanorama 886356dcd5 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AbstractCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java

2019-03-22 09:11:46 +01:00

..

nbproject

Upgraded jar reference in ImageGallery, Core, and Keyword Search

2019-01-07 10:18:11 -05:00

src/org/sleuthkit/autopsy/imagegallery

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

2019-03-22 09:11:46 +01:00

.gitattributes

3386: Update the files permission from 755 to 644

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

.gitignore

3386: Update the files permission from 755 to 644

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

build.xml

Revert "Revert "Copy merged bundles into src folder so that they can be checked in.""

2019-02-23 14:24:44 -05:00

LICENSE-2.0.txt

3386: Update the files permission from 755 to 644

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

manifest.mf

Updated versions for release

2018-10-26 11:12:26 -04:00