Merge branch 'release-4.10.1' into develop

arisjr · Nov 3, 2020 · 689afad · 689afad
2 parents 38a13f9 + e8bc8f1
commit 689afad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/NEWS.txt b/NEWS.txt
@@ -1,10 +1,10 @@
 ---------------- VERSION 4.10.1 --------------
-
-NEED TO FINISH
-
 C/C++:
-- Changed Windows build to use Nuget for libewf, libvmdk, libvhdi
-- Fixed compiler warnings and updated license files
+- Changed Windows build to use Nuget for libewf, libvmdk, libvhdi.
+- Fixed compiler warnings 
+- Clarrified licenses and added Apache license to distribution
+- Improved error handling for out of memory issues
+- Rejistry++ memory leak fixes
 
 Java:
 - Localized for Japanese

diff --git a/case-uco/java/nbproject/project.properties b/case-uco/java/nbproject/project.properties
@@ -35,14 +35,14 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.gson-2.8.5.jar=lib/gson-2.8.5.jar
-file.reference.sleuthkit-4.10.1.jar=lib/sleuthkit-4.10.1.jar
+file.reference.sleuthkit-4.10.1.jar=lib/sleuthkit-4.10.1.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.gson-2.8.5.jar}:\
-    ${file.reference.sleuthkit-4.10.1.jar}
+${file.reference.sleuthkit-4.10.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint
 javac.deprecation=false