Richard Cordovano d2c052fcb2 Resolve merge conflicts for develop branch merge

2015-05-28 10:27:02 -04:00

..

nbproject

Re-disable ImageGallery

2015-03-23 14:24:26 -04:00

release/modules/ext

Renaming ImageAnalyzer to ImageGallery (in progress)

2015-03-23 10:12:11 -04:00

src/org/sleuthkit/autopsy/imagegallery

Resolve merge conflicts for develop branch merge

2015-05-28 10:27:02 -04:00

.gitattributes

Renaming ImageAnalyzer to ImageGallery (in progress)

2015-03-23 10:12:11 -04:00

.gitignore

Renaming ImageAnalyzer to ImageGallery (in progress)

2015-03-23 10:12:11 -04:00

build.xml

Renaming ImageAnalyzer to ImageGallery (in progress)

2015-03-23 10:12:11 -04:00

LICENSE-2.0.txt

Renaming ImageAnalyzer to ImageGallery (in progress)

2015-03-23 10:12:11 -04:00

manifest.mf

Finishing renaming.

2015-03-23 14:14:24 -04:00