adam-m 3cc483d6de Merge branch 'master' into local-files ...

Conflicts:
	Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
	Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
	Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
	Core/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterChildren.java
	Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
	Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java

2013-05-17 15:50:30 -04:00

..

nbproject

update modules versions for the release

2013-03-20 15:13:07 -04:00

src/org/sleuthkit/autopsy

Merge branch 'master' into local-files

2013-05-17 15:50:30 -04:00

build.xml

update sqlite jdbc

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

manifest.mf

update modules versions for the release

2013-03-20 15:13:07 -04:00