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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Sean-M 2013-02-21 16:01:42 -05:00
commit cea2c49965
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
KeywordSearch/nbproject/genfiles.properties
View File

@ -1,8 +0,0 @@
build.xml.data.CRC32=eaa84b46
build.xml.script.CRC32=87b97b04
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=8af8eb1a
nbproject/build-impl.xml.script.CRC32=fe1f48d2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1

8
Testing/nbproject/genfiles.properties
View File

@ -1,8 +0,0 @@
build.xml.data.CRC32=7c2c586b
build.xml.script.CRC32=323ed73c
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=9e7b1a5d
nbproject/build-impl.xml.script.CRC32=d8a1ea41
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1

4
Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java
View File

@ -819,7 +819,9 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
logger.log(Level.SEVERE, "Could not find a file with ID " + ObjId, ex); logger.log(Level.SEVERE, "Could not find a file with ID " + ObjId, ex);
continue; continue;
} }
ye.add(file, month, day); if (ye != null) {
ye.add(file, month, day);
}
} }
scan.close(); scan.close();