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

Conflicts:
	Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
	Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java

2013-11-19 15:49:13 -05:00

..

nbproject

First step in merge of new_tags_api branch into master

2013-10-23 10:58:49 -04:00

src/org/sleuthkit/autopsy

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

2013-11-19 15:49:13 -05:00

autopsy-updates.xml

adding update notification checking - this requires autopsy-updates.xml to be uploaded to sleuthkit.org

2013-09-16 16:18:18 -04:00

build.xml

update sqlite jdbc

2012-11-07 16:25:50 -05:00

manifest.mf

updated module version numbers and Autopsy version numbers

2013-09-25 13:57:45 -04:00