jmillman 334bd901cd Merge remote-tracking branch 'upstream/develop' into events_tags_categories_rework ...

Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java

2015-06-24 10:42:50 -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

Merge remote-tracking branch 'upstream/develop' into events_tags_categories_rework

2015-06-24 10:42:50 -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

change the project name in the build script

2015-06-11 10:12:26 -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