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
..
2012-11-07 16:25:50 -05:00