Commit Graph
2 Commits
Author SHA1 Message Date
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
Jeff Wallace d4ef8013ff Added new ewfVerify ingest module 2013-10-10 16:12:43 -04:00