bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java · bfaaafac929716a838feee9b18142ccc010585fb · IRT / Sleuthkit

11 years ago

Merge branch 'master' of https://github.com/sleuthkit/sleuthkit · 062e03e7

raman-bt authored 11 years ago

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
	framework/tsk/framework/services/TskBlackboard.cpp
	framework/tsk/framework/services/TskBlackboard.h

062e03e7

History

Merge branch 'master' of https://github.com/sleuthkit/sleuthkit

raman-bt authored 11 years ago

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
	framework/tsk/framework/services/TskBlackboard.cpp
	framework/tsk/framework/services/TskBlackboard.h

Code owners

Assign users and groups as approvers for specific file changes. Learn more.