William Schaefer a6652d5220 5319 resolve merge conflicts

2019-08-28 13:21:20 -04:00

..

nbproject

Update NBM versioning for release 4.12.0

2019-07-31 15:18:56 -04:00

src/org/sleuthkit/autopsy/experimental

5319 resolve merge conflicts

2019-08-28 13:21:20 -04: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

Tika appears to be stable, needs far more testing and verification

2019-01-11 15:54:49 -05:00

ivysettings.xml

3386: Update the files permission from 755 to 644

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

manifest.mf

Merged in develop

2019-04-02 11:16:52 -04:00