Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

c1b51700

Commit c1b51700 authored 5 years ago by Brian Carrier

Downloads
- Plain Diff

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

parents 26afa934 9bd64ebb

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Makefile.am 2 additions, 1 deletion

Makefile.am
README.md 15 additions, 6 deletions

README.md
bindings/java/doxygen/artifact_catalog.dox 4 additions, 2 deletions

bindings/java/doxygen/artifact_catalog.dox
bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java 5 additions, 1 deletion

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

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
licenses/bsd.txt 16 additions, 0 deletions

licenses/bsd.txt
licenses/mit.txt 24 additions, 0 deletions

licenses/mit.txt
tsk/docs/hashdb.dox 1 addition, 1 deletion

tsk/docs/hashdb.dox
tsk/fs/fs_types.c 11 additions, 7 deletions

tsk/fs/fs_types.c
tsk/fs/ntfs.c 3 additions, 1 deletion

tsk/fs/ntfs.c

with 82 additions and 19 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