Alexander Ebadirad f30e4e4975 Merge branch 'master' of https://github.com/sleuthkit/autopsy ...

Conflicts:
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.form
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java

2012-01-31 15:31:04 -07:00

..

nbproject

- Ingest framework skeleton

2012-01-24 14:48:10 -05:00

release/solr

Fixed exception that occured if SOLR was not shutdown when autopsy was in debug session. Cleaned up SOLR Server code a little bit.

2012-01-02 23:24:11 -05:00

src/org/sleuthkit/autopsy/keywordsearch

Merge branch 'master' of https://github.com/sleuthkit/autopsy

2012-01-31 15:31:04 -07:00

build.xml

More-complete javadoc & comments

2011-12-07 15:38:21 -05:00

ivy.xml

More-complete javadoc & comments

2011-12-07 15:38:21 -05:00

manifest.mf

move explorer components to tab, create a new TC that manages and delegates to the tab TCs

2011-12-29 13:06:11 -05:00