jmillman 7c90264368 Merge remote-tracking branch 'upstream/develop' into zoom-out-fixes ...

Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties
	Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java

2015-10-21 16:26:02 -04:00

..

nbproject

use SolrSearchService

2015-10-02 12:26:55 -04:00

release

face detection feature added

2015-08-27 16:28:20 -04:00

src/org/sleuthkit/autopsy

Merge remote-tracking branch 'upstream/develop' into zoom-out-fixes

2015-10-21 16:26:02 -04:00

autopsy-updates.xml

…

build.xml

Merge in upstream/collaborative, resolve conflict

2015-08-26 15:34:53 -04:00

manifest.mf

Updated versions to 3.1.3

2015-06-18 15:41:47 -04:00

updates_ja.xml

…