jmillman 0f99c1cee0 Merge remote-tracking branch 'image_analyzer/develop' into image_analyzer
Conflicts:
	.gitattributes
	.gitignore
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/platform.properties
	nbproject/project.properties
	nbproject/project.xml
2014-08-05 14:05:43 -04:00

6 lines
205 B
Plaintext

Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.imageanalyzer
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
OpenIDE-Module-Specification-Version: 1.0