adam-m b897ac4f42 Merge branch 'master' into new-features-20120503 ...

Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java

2012-05-15 10:37:26 -04:00

..

nbproject

Issues with grabbing installed programs, tweak to xls pages.

2012-04-11 17:48:47 -07:00

src/org/sleuthkit/autopsy/ingest

Merge branch 'master' into new-features-20120503

2012-05-15 10:37:26 -04:00

build.xml

- Ingest framework skeleton

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

manifest.mf

Ingest installer class to fully initialize manager early and at determined time instance, independetly from previously saved top component state.

2012-02-24 09:36:38 -05:00