millmanorama c158e71fec Merge branch 'timeline-event-mgr' into 1157-collapse_file_events ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java

2019-03-20 12:50:24 +01:00

..

nbproject

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

2019-03-01 12:20:18 +01:00

src/org/sleuthkit/autopsy/thunderbirdparser

Merge branch 'timeline-event-mgr' into 1157-collapse_file_events

2019-03-20 12:50:24 +01: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

ivy.xml

VCard support added.

2019-02-27 13:28:25 -05:00

ivysettings.xml

3386: Update the files permission from 755 to 644

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

manifest.mf

3386: Update the files permission from 755 to 644

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