Samuel H. Kenyon 4d31147f8f Merge remote-tracking branch 'upstream/develop' into sigid3 ...

Conflicts:
	nbproject/project.properties

2013-12-16 14:02:46 -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 remote-tracking branch 'upstream/develop' into sigid3

2013-12-16 14:02:46 -05:00

project.xml

Initial import into github

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