mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into include_all_drawable_mimetypes

Browse Source 
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
This commit is contained in:
jmillman 2015-07-02 17:09:25 -04:00
commit f7e56bebcc
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/nbproject/project.xml
View File

@ -182,21 +182,6 @@
</dependency> </dependency>
</module-dependencies> </module-dependencies>
<public-packages> <public-packages>
<package>org.apache.tika</package>
<package>org.apache.tika.config</package>
<package>org.apache.tika.detect</package>
<package>org.apache.tika.exception</package>
<package>org.apache.tika.extractor</package>
<package>org.apache.tika.fork</package>
<package>org.apache.tika.io</package>
<package>org.apache.tika.language</package>
<package>org.apache.tika.metadata</package>
<package>org.apache.tika.mime</package>
<package>org.apache.tika.parser</package>
<package>org.apache.tika.parser.external</package>
<package>org.apache.tika.sax</package>
<package>org.apache.tika.sax.xpath</package>
<package>org.apache.tika.utils</package>
<package>org.sleuthkit.autopsy.actions</package> <package>org.sleuthkit.autopsy.actions</package>
<package>org.sleuthkit.autopsy.casemodule</package> <package>org.sleuthkit.autopsy.casemodule</package>
<package>org.sleuthkit.autopsy.casemodule.services</package> <package>org.sleuthkit.autopsy.casemodule.services</package>

1
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
View File

@ -1214,6 +1214,7 @@ public final class DrawableDB {
} else { } else {
return videoFileMap.computeIfAbsent(f.getId(), (id) -> FileTypeUtils.isVideoFile(f)); return videoFileMap.computeIfAbsent(f.getId(), (id) -> FileTypeUtils.isVideoFile(f));
} }
} }
/** /**