From: dan <Dan Kennedy>
Date: Fri, 1 Dec 2023 20:10:20 +0000 (+0000)
Subject: Merge latest trunk with this branch.
X-Git-Tag: version-3.45.0~114^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebd173a79f7a788e4c764c094ff8f7b18d57b5f1;p=thirdparty%2Fsqlite.git

Merge latest trunk with this branch.

FossilOrigin-Name: 8258967411d3ff212424b25fec79ded0d8ae83e773cd35a0bbf300c94923f25b
---

ebd173a79f7a788e4c764c094ff8f7b18d57b5f1
diff --cc manifest
index 04745fb5d2,d6a02fa193..07814168f5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Different\sapproach\sto\squerying\sa\stokendata=1\stable.\sSaves\scpu\sand\smemory.
- D 2023-12-01T20:09:59.031
 -C Add\sa\sbasic\sbatch-mode\sSQL\srunner\sfor\sthe\sSAH\sPool\sVFS,\sfor\suse\sin\scomparing\sit\sagainst\sWebSQL.\sBring\sthe\sWebSQL\sbatch\srunner\sup\sto\sdate,\snoting\sthat\sit\scannot\srun\swithout\saddition\sof\san\s"origin\strial"\sactivation\skey\sfrom\sGoogle\sbecause\sthat's\snow\sthe\sonly\sway\sto\senable\sWebSQL\sin\sChrome\s(that\spart\sis\snot\schecked\sin\sbecause\sthat\skey\sis\sprivate).\sMinor\scode-adjacent\scleanups.
 -D 2023-11-30T20:34:24.440
++C Merge\slatest\strunk\swith\sthis\sbranch.
++D 2023-12-01T20:10:20.295
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2146,8 -2145,8 +2148,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 60e46c7ec68fd8caaed960ca06d98fb06855b2d0bb860dd2fb7b5e89a5e9c7b4
- R e2c2c11ec4bab5e354a94b25a41ae3cd
 -P 6802b6459d0d16c961ff41d240a6c88287f197d8f609090f79308707490a49c2
 -R 0685d189d0b0c5921f2e4eda3787211e
 -U stephan
 -Z 5692f67161061876d9b3bcabcb3928cc
++P c523f40895866e6fc979a26483dbea8206126b4bbdf4b73b77263c09e13c855e 883990e7938c1f63906300a6113f0fadce143913b7c384e8aeb5f886f0be7c62
++R 070accca4f04b7da788d8a587600de24
 +U dan
- Z f7d96142774ad25f02aad90982aa0fc8
++Z 0994bbca14fc53076151cd58ec1e7d74
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index e669309199,98d7aac12d..1398e08598
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c523f40895866e6fc979a26483dbea8206126b4bbdf4b73b77263c09e13c855e
 -883990e7938c1f63906300a6113f0fadce143913b7c384e8aeb5f886f0be7c62
++8258967411d3ff212424b25fec79ded0d8ae83e773cd35a0bbf300c94923f25b