Jeff Wallace d11df43a1d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ewfVerifyIngest ...

Conflicts:
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
	nbproject/project.properties

2013-12-12 14:58:21 -05:00

..

build-impl.xml

Move Logger and AutopsyPropFile into new module, CoreUtils

2012-01-06 16:29:42 -05:00

genfiles.properties

Move Logger and AutopsyPropFile into new module, CoreUtils

2012-01-06 16:29:42 -05:00

platform.properties

Fix merge of platform.properties file

2013-10-23 16:30:13 -04:00

platform.xml

Move Logger and AutopsyPropFile into new module, CoreUtils

2012-01-06 16:29:42 -05:00

project.properties

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ewfVerifyIngest

2013-12-12 14:58:21 -05:00

project.xml

Initial import into github

2011-11-09 13:10:50 -05:00