Richard Cordovano 9b596da3c9 Merge in develop branch and resolve merge conflicts

2019-10-08 14:23:22 -04:00

..

nbproject

Merge pull request #5293 from markmckinnon/5565-add-support-for-webp-image-files

2019-10-07 17:05:15 -04:00

src/org/sleuthkit/autopsy

Merge in develop branch and resolve merge conflicts

2019-10-08 14:23:22 -04:00

test

Merge branch 'elastic-computing' into develop

2019-09-18 13:45:57 -04:00

autopsy-updates.xml

…

build.xml

Merge pull request #4932 from kellykelly3/1269-merg-timeline

2019-06-28 14:11:46 -04:00

ivy.xml

Get jar using ivy

2019-10-02 08:12:48 -04:00

ivysettings.xml

…

manifest.mf

Update NBM versioning for release 4.13.0

2019-10-04 17:44:53 -04:00

updates_ja.xml

…