Jeff Wallace 65bb4a05ed Merge https://github.com/sleuthkit/autopsy ...

Conflicts: (due to line ending problems)
	Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
	build-windows.xml
	build.xml

2013-08-22 09:54:56 -04:00

..

nbproject

Updated project.xml in Core to remove vlc dependency

2013-08-13 12:58:13 -04:00

src/org/sleuthkit/autopsy

Merge https://github.com/sleuthkit/autopsy

2013-08-22 09:54:56 -04:00

build.xml

update sqlite jdbc

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

manifest.mf

update modules versions for the release

2013-06-05 12:49:07 -04:00