jmillman 5c4bd438e8 Merge remote-tracking branch 'upstream/develop' into double_click_activate_tile_view ...

Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java

2015-07-28 14:02:55 -04:00

..

build-impl.xml

Finishing renaming.

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

genfiles.properties

Renaming ImageAnalyzer to ImageGallery (in progress)

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

platform.properties

changed the url to use netbeans (more reliable source)

2015-07-15 13:29:55 -04:00

project.properties

Finishing renaming.

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

project.xml

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

2015-07-28 14:02:55 -04:00

suite.properties

cleanup logic in DataContentViewerMedia

2015-07-09 17:24:19 -04:00