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

Conflicts:
	CoreLibs/nbproject/project.properties
This commit is contained in:
jmillman 2015-06-16 12:53:39 -04:00
commit 835347f092

View File

@ -1,4 +1,5 @@
<ivy-module version="2.0">
<info organisation="org.sleuthkit.autopsy" module="corelibs"/>
<configurations >