Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

45a78eca

Unverified Commit 45a78eca authored 1 year ago by eugene7646 Committed by GitHub 1 year ago

Downloads
- Plain Diff

Merge pull request #2866 from sleuthkit/develop

Merge develop

parents faaf962c e2a6c99d

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/ivy.xml 1 addition, 1 deletion

bindings/java/ivy.xml
bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 13 additions, 2 deletions

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

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

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

bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
debian/sleuthkit-java.install 1 addition, 1 deletion

debian/sleuthkit-java.install

with 21 additions and 5 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