Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

718d08d5

Commit 718d08d5 authored 3 years ago by Brian Carrier

Downloads
- Plain Diff

Merge branch 'develop' of github.com:sleuthkit/sleuthkit into develop

parents 1de84766 a4d0ca8e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

bindings/java/doxygen/artifact_catalog.dox 26 additions, 28 deletions

bindings/java/doxygen/artifact_catalog.dox
bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 51 additions, 5 deletions

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

...java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
bindings/java/src/org/sleuthkit/datamodel/Bundle.properties 7 additions, 0 deletions

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED 7 additions, 0 deletions

...java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
bindings/java/src/org/sleuthkit/datamodel/Content.java 1 addition, 1 deletion

bindings/java/src/org/sleuthkit/datamodel/Content.java

with 110 additions and 36 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