adam-m 28f21129d5 Merge branch 'master' into zipmodule ...

Conflicts:
	NEWS.txt
	nbproject/project.properties

2013-02-07 11:14:23 -05:00

..

nbproject

change java source level to 1.7

2013-01-20 08:48:14 -05:00

src/org/sleuthkit/autopsy

Merge branch 'master' into zipmodule

2013-02-07 11:14:23 -05:00

build.xml

update sqlite jdbc

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

manifest.mf

Update versions for 3.0.4 release

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