Samuel H. Kenyon 4d31147f8f Merge remote-tracking branch 'upstream/develop' into sigid3 ...

Conflicts:
	nbproject/project.properties

2013-12-16 14:02:46 -05:00

..

actions

Added code to AddContentTagAction to handle current and parent directory entries

2013-11-18 18:04:53 -05:00

casemodule

Merge pull request #362 from raman-bt/flexiwizard

2013-11-26 06:05:58 -08:00

contentviewers

typo changes from Derrick Karpo

2013-12-03 11:07:28 -05:00

core

Only explicitly load zlib and libewf from windows.

2013-11-21 14:34:02 -05:00

corecomponentinterfaces

Merge branch 'develop' into flexiwizard

2013-11-19 13:33:18 -05:00

corecomponents

Fix DataResultViewerTable lazy node creation bugs

2013-12-09 17:48:20 -05:00

coreutils

Remove adding hashes of virtual directories, other small fixes

2013-11-15 17:28:17 -05:00

datamodel

Merge remote-tracking branch 'upstream/develop' into sigid3

2013-12-16 14:02:46 -05:00

directorytree

resolved merge conflicts

2013-12-03 14:56:44 -05:00

examples

Fixed typo in sample ingest module

2013-08-16 12:54:02 -04:00

filesearch

Updated the labels in KnownStatusSearchPanel fro multiple known databases

2013-11-18 14:43:46 -05:00

images

Handle new artifacts/attributes for Autopsy/MPF integration.

2013-08-07 08:49:45 -04:00

ingest

Merge remote-tracking branch 'upstream/develop' into sigid3

2013-12-16 14:02:46 -05:00

menuactions

- fix bug and crash if file search result tc closed, and window menu entry for the tc is still available

2013-01-22 22:28:27 -05:00

report

Finish merge cleanup

2013-12-11 17:36:44 -05:00