millmanorama 3fd348a079 Merge branch 'timeline-event-mgr' into 1192-manually_created_events ...

# Conflicts:
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

2019-03-29 11:14:13 +01:00

..

nbproject

Removed the plist jar from recentActivity, it should be using the one from corelib now.

2019-03-04 12:50:01 -05:00

src/org/sleuthkit/autopsy/recentactivity

Merge branch 'timeline-event-mgr' into 1192-manually_created_events

2019-03-29 11:14:13 +01:00

build.xml

Merge branch 'develop' into edge_support

2019-03-05 09:56:14 -05:00

ivy.xml

removed commented out line from ivy.xml

2019-03-05 16:12:58 -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