jmillman 38162049b4 Merge remote-tracking branch 'upstream/develop' into metadata_copyable ...

Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java

2015-07-30 10:36:41 -04:00

..

nbproject

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

2015-07-28 14:02:55 -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 metadata_copyable

2015-07-30 10:36:41 -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