From: stephan <stephan@noemail.net>
Date: Thu, 10 Aug 2023 01:05:28 +0000 (+0000)
Subject: Merge trunk into jni branch.
X-Git-Tag: version-3.43.0~47^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58c2ca4483fee92eb4848ddb466e633682aaeb8a;p=thirdparty%2Fsqlite.git

Merge trunk into jni branch.

FossilOrigin-Name: 52fa6f78414c41073431c166550806bb8a835bd38cfc1236c9363784c78b81b9
---

58c2ca4483fee92eb4848ddb466e633682aaeb8a
diff --cc manifest
index 7a15348fb2,26ed34f8d1..671fa3e44d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Treat\sall\sargs\sto\s--glob\sas\sa\ssingle\sglob.
- D 2023-08-10T01:03:19.375
 -C Minor\scleanups\sin\ssqlite3Int.h.\s\sBy\sreordering\ssome\sfields\sin\sthe\sParse\nobject,\sit\spacks\smore\stightly\sand\suses\sless\smemory\sand\sless\sCPU\sto\ninitialize.
 -D 2023-08-08T17:36:03.881
++C Merge\strunk\sinto\sjni\sbranch.
++D 2023-08-10T01:05:28.422
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2090,8 -2050,8 +2091,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 15cfee972bcbd857d18ea626c9a9da64b2a445516946f3dd83c75a4f6b8a92fa
- R d87c671bcff8c274e753f8136bcb0ba4
 -P 293f6191e9b328cb8a8d3fff0f7bd5a6f5390b5ff090497a170c791b6ea22917
 -R 13de6fab3751f215b8cb399b0a8433e9
 -U drh
 -Z 9646a5d58abf6d956e75b2b4249fce92
++P 4737bd345732e34cabbf90821e007d3027e68d6583c2e05e1e8bf5920373a6dc aa6de539c09faa320b68c63659e602107145c4263fa680d5b40fe4d7d7ac4534
++R 3d8bf06cb5fd09f5007b52014737203d
 +U stephan
- Z 3a5d0d87ef0d81bf62d0862f9674bbc7
++Z 31e6b9c8838dedba9bb6eecc51954ae6
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 44b844827b,a11170fc8e..8404ad041a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4737bd345732e34cabbf90821e007d3027e68d6583c2e05e1e8bf5920373a6dc
 -aa6de539c09faa320b68c63659e602107145c4263fa680d5b40fe4d7d7ac4534
++52fa6f78414c41073431c166550806bb8a835bd38cfc1236c9363784c78b81b9