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

Trying to fix panel.

2012-07-27 13:48:59 -04:00

genfiles.properties

Created a General options panel containing a single checkbox to 'Remember preferred content viewer' - no real functionality yet.

2012-12-28 11:00:14 -05: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

Moving hashdatabase package to new module

2012-01-24 17:03:46 -05:00