Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

24efce71

Commit 24efce71 authored 11 years ago by Nick Davis

Downloads
- Plain Diff

resolved merge conflicts

parents 3d1b9c71 7305f7a6

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 3 additions, 1 deletion

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

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

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

framework/tsk/framework/services/TskBlackboard.h

with 19 additions and 4 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