William Schaefer 0a4cba4498 5118 resolve merge conflicts

2019-08-28 10:53:59 -04:00

..

nbproject

Update NBM versioning for release 4.12.0

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

src/org/sleuthkit/autopsy/imagegallery

5118 resolve merge conflicts

2019-08-28 10:53:59 -04:00

.gitattributes

3386: Update the files permission from 755 to 644

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

.gitignore

3386: Update the files permission from 755 to 644

2018-01-03 14:43:27 -05: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

LICENSE-2.0.txt

3386: Update the files permission from 755 to 644

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

manifest.mf

Update module version numbers for 4.11.0 release

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