upstream update; cleanup merge issues

ppiecuch · Jan 27, 2024 · 9ec54d5 · 9ec54d5
2 parents ddaefa2 + e184e62
commit 9ec54d5
Show file tree

Hide file tree

Showing 140 changed files with 2,868 additions and 3,855 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -408,7 +408,7 @@ License: Expat
 
 Files: ./thirdparty/zlib/
 Comment: zlib
-Copyright: 1995-2022, Jean-loup Gailly and Mark Adler
+Copyright: 1995-2023, Jean-loup Gailly and Mark Adler
 License: Zlib
 
 Files: ./thirdparty/zstd/