Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

e909a084

Commit e909a084 authored 10 years ago by alexjacks92

Downloads
- Plain Diff

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

parents 4ad5f0eb 7305f7a6

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 1 addition, 0 deletions

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

...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
tsk/auto/db_sqlite.cpp 333 additions, 323 deletions

tsk/auto/db_sqlite.cpp
tsk/fs/ntfs_dent.cpp 13 additions, 3 deletions

tsk/fs/ntfs_dent.cpp

with 363 additions and 330 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