millmanorama 0e0d41185a Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
#	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
#	thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java

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

..

build-impl.xml

3386: Update the files permission from 755 to 644

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

project.properties

VCard support added.

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

project.xml

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

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

suite.properties

3386: Update the files permission from 755 to 644

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