Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

cb434265

Commit cb434265 authored 4 years ago by Kelly Kelly

Downloads
- Plain Diff

Fixed merge conflict and updated artifact_catalog

parents c8b12517 ecdac17e

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

bindings/java/doxygen/artifact_catalog.dox 89 additions, 2 deletions

bindings/java/doxygen/artifact_catalog.dox
bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 34 additions, 4 deletions

.../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
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/blackboardutils/attributes/GeoTrackPoints.java 6 additions, 2 deletions

.../datamodel/blackboardutils/attributes/GeoTrackPoints.java

with 147 additions and 8 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