APriestman 99d3dad710 Merge remote-tracking branch 'upstream/develop' into develop ...

Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java

2014-02-19 13:33:08 -05:00

..

build-impl.xml

Move Logger and AutopsyPropFile into new module, CoreUtils

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

genfiles.properties

Saving before merge attempt

2014-02-19 13:11:01 -05:00

platform.properties

Fix merge of platform.properties file

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

platform.xml

Saving before merge attempt

2014-02-19 13:11:01 -05:00

project.properties

Add notes on running with localization for Japan

2014-01-29 14:50:13 -05:00

project.xml

Initial import into github

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