Merge branch '3624-tree-table-view' of https://github.com/briangsweeney/autopsy into 3624-tree-table-view

Browse Source

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java

...

This commit is contained in:

Brian Sweeney 2018-04-04 07:15:56 -06:00

parent 8a6c7b6e3d

commit 2f00491528

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files