From: dan <Dan Kennedy>
Date: Wed, 21 Feb 2024 16:12:23 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Tag: version-3.46.0~193^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebd99d5708fdc32b599faa1d8e1661fc6395e12d;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: 63e8846ac1dc1cf1f7071c4634ccbfec3c13560db6afec376cd91515b62430d3
---

ebd99d5708fdc32b599faa1d8e1661fc6395e12d
diff --cc manifest
index 6b38631176,8ad3679fb6..7a0b8e41ea
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Have\sthe\sintck\sextension\sbetter\shandle\scorruption\sat\sthe\sb-tree\slayer.
- D 2024-02-20T20:18:02.615
 -C Fixes\sto\scomments\sassociated\swith\sthe\srecent\sPRAGMA\soptimize\senhancements.\nNo\schanges\sto\scode.
 -D 2024-02-20T15:38:36.661
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-02-21T16:12:23.138
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2169,8 -2162,8 +2169,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 95f01426f948cf435d0b400dc7ae06fa699eee32cff498fe77e74a1257a4e09b
- R 2f81579b76b29691695c15522ce87fed
 -P 4c9886b692706723f4b68f58dfef07ab19b192fd19b953917f23b55655af3e02
 -R 40f50207938b86842b8686e871138379
 -U drh
 -Z 751534f3f8e8461179e5c9344b944b7a
++P ecd775d108f77d39a1303316c1e0f0b0ae3ffc5218222e1ebfe2ef6783829b85 27a2113d78b35e324e9aedda7403c96c56ad0bed8c6b139fc5a179e8800b9109
++R 73b41ee05e607fc52a1cc8e54ddf3838
 +U dan
- Z 5af5831e9af2fce3b2d0c2673f03eefa
++Z 458475bfe24db2c8e52b55b2e9078f6a
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f905e93b9b,a82c127f34..fc124a8b54
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ecd775d108f77d39a1303316c1e0f0b0ae3ffc5218222e1ebfe2ef6783829b85
 -27a2113d78b35e324e9aedda7403c96c56ad0bed8c6b139fc5a179e8800b9109
++63e8846ac1dc1cf1f7071c4634ccbfec3c13560db6afec376cd91515b62430d3