Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Sleuthkit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IRT
Sleuthkit
Commits
0daef8be
Commit
0daef8be
authored
6 years ago
by
Ann Priestman
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'upstream/develop' into 4682_addImage
parents
2e848ae4
bf245aa7
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
+11
-1
11 additions, 1 deletion
.../java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+2
-0
2 additions, 0 deletions
bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
with
13 additions
and
1 deletion
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
