From: dan <Dan Kennedy>
Date: Wed, 13 Mar 2024 15:47:52 +0000 (+0000)
Subject: Merge trunk into this branch.
X-Git-Tag: version-3.46.0~123^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=693d3867eac9ab3e7fac5e53bd610b1d2a0d4f36;p=thirdparty%2Fsqlite.git

Merge trunk into this branch.

FossilOrigin-Name: 38635651f08d42110c01d6b24f6e362e340511846294f8696af4afc795dae80d
---

693d3867eac9ab3e7fac5e53bd610b1d2a0d4f36
diff --cc manifest
index fc5a54bd05,f47cb0a280..80413c4c4e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ensure\sthat\sif\sa\smulti-row\sVALUES\scannot\sbe\scoded\swhile\sbeing\sparsed,\sthe\sSF_MultiValue\sflag\sis\scorrectly\sset.
- D 2024-03-13T15:44:31.439
 -C If\sthe\sNJOB\senvironment\svariable\sis\sa\spositive\sinteger,\sit\scauses\ntestrunner.tcl\sto\srun\sthat\smany\sjobs.
 -D 2024-03-13T13:43:21.042
++C Merge\strunk\sinto\sthis\sbranch.
++D 2024-03-13T15:47:52.750
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2179,8 -2177,8 +2179,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 4229b12b327b05561dcf49b8585a66467d17d4e998b14eff65eb886f2434b53c
- R 759c4fdaf4045c9f2dff7c53c191816c
 -P 5a7b5fc99a9d5c7693a5707c2050a8c59a8f97732e4763a56982579f8d5959ec
 -R 407830b5c90e1eed2d3fe5c7fa3b86c4
 -U drh
 -Z 7cb4f1a4becd0bff0730a94c93a2e20f
++P 94791824a6f04782aac6bc16c182685e2d6ebf5c688dc9f8d59e479c6fd5a40e 924281b94d8e6ba674d6fe2f7f01da890351355a854e9e6fe623fad1180f7392
++R af81f2952048774d882db6d201804b0c
 +U dan
- Z 9143cafae67b08f919f57c93acfe5550
++Z a427b7a910e44c4f56ce4ce6ef8524f2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index bd6f8334d3,a1fceec15d..4f0c6af8d4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 94791824a6f04782aac6bc16c182685e2d6ebf5c688dc9f8d59e479c6fd5a40e
 -924281b94d8e6ba674d6fe2f7f01da890351355a854e9e6fe623fad1180f7392
++38635651f08d42110c01d6b24f6e362e340511846294f8696af4afc795dae80d