Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Sleuthkit
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1cdf40b6

Commit 1cdf40b6 authored 11 years ago by Richard Cordovano

Downloads
- Plain Diff

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

parents 2eedba43 bf65d53e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 4 additions, 2 deletions

.../java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java 7 additions, 3 deletions

...java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
framework/tsk/framework/services/TskBlackboard.cpp 3 additions, 1 deletion

framework/tsk/framework/services/TskBlackboard.cpp
framework/tsk/framework/services/TskBlackboard.h 6 additions, 5 deletions

framework/tsk/framework/services/TskBlackboard.h

with 20 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment