Tim McIver a71143591f Merge branch 'master' of https://github.com/sleuthkit/autopsy into timeline ...

Conflicts:
	thunderbirdparser/nbproject/project.properties

2013-01-18 11:07:50 -05:00

..

build-impl.xml

Initial test script commit.

2012-05-21 10:10:56 -04:00

genfiles.properties

Initial merge of core modules - it does build.

2012-09-25 18:14:40 -04:00

project.properties

Updates in effort to upgrade from Java 6 to Java 7.

2013-01-14 16:58:32 -05:00

project.xml

Update versions for 3.0.4 release

2013-01-18 09:56:07 -05:00

suite.properties

Initial test script commit.

2012-05-21 10:10:56 -04:00