Ann Priestman 4f214da39e Merge remote-tracking branch 'upstream/develop' into 4906_portableCaseCompression ...

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/report/Bundle.properties
#	Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED

2019-04-23 09:30:14 -04:00

..

nbproject

Update module version numbers for 4.11.0 release

2019-04-17 11:32:33 -04:00

src/org/sleuthkit/autopsy

Merge remote-tracking branch 'upstream/develop' into 4906_portableCaseCompression

2019-04-23 09:30:14 -04:00

test

Revert "merge develop into Timeline event mgr"

2019-04-19 13:16:26 -04:00

autopsy-updates.xml

3386: Update the files permission from 755 to 644

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

build.xml

Revert "merge develop into Timeline event mgr"

2019-04-19 13:16:26 -04:00

ivy.xml

moving plist jar from core to corelib, had build errors

2019-02-22 11:49:07 -05:00

ivysettings.xml

Merge remote-tracking branch 'upstream/cvt-graph-view' into CVT-VisualizeTab

2018-01-09 12:04:51 +01:00

manifest.mf

Update module version numbers for 4.11.0 release

2019-04-17 11:32:33 -04:00

updates_ja.xml

3386: Update the files permission from 755 to 644

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