From: stephan <stephan@noemail.net>
Date: Tue, 6 Dec 2022 06:21:02 +0000 (+0000)
Subject: Merge trunk into wasm-vtab branch.
X-Git-Tag: version-3.41.0~291^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2bbef39516f9f26e1f107a21de4e24e24551327;p=thirdparty%2Fsqlite.git

Merge trunk into wasm-vtab branch.

FossilOrigin-Name: d106edb956bbe22bddc2c6e5bcdf4fb8f797794c725c2e359e3fa4b31d881843
---

f2bbef39516f9f26e1f107a21de4e24e24551327
diff --cc manifest
index b4b8f16bb1,eb01d8ca73..14bb688eee
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\stest\stweaks.
- D 2022-12-06T06:16:11.079
 -C Add\soptional\sfeature:\sA\sCLI\scontinuation\sprompt\swhich\sreflects\sopen\slexemes\sand\sparens,\ssimilarly\sto\sPG\sshell.
 -D 2022-12-06T05:31:20.264
++C Merge\strunk\sinto\swasm-vtab\sbranch.
++D 2022-12-06T06:21:02.190
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2065,8 -2067,8 +2067,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 60482c97e02bc4cafefef281be0cf0bc8c5c53232162829c137f3f7a80cdc534
- R 72355a527ceb0556cf62fff969df2dd7
 -P 4893b4e3eafc7c9c22b24717f90a585862203f987cf108b079ce6e946093e675 dac2ddc287db7a68d0cd49b785060f62290868fbb1aa2ee09e54d3b1acfbf55f
 -R 4e6f769112d568da8b23927a4847535b
 -U larrybr
 -Z 19f7409ace4582d7233d6e9f94f36495
++P f902f3b2c79d6c699ead1efeb1426e1e0f4ac709afdff88be1de62f34f3d5ccc f41f18b1c3c950565ee3c237aebb51cfc3241813c6425813a8217e07aa0153a6
++R 8bcaf9d3b9f238bc8e19a8bbe1bb65e6
 +U stephan
- Z 77f81bcdf15e49ab52ab2cf2ea76255f
++Z 78f5f82441cc43a02424eee016e46cb3
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7d693291c1,02dae66a86..1b960ebdc5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f902f3b2c79d6c699ead1efeb1426e1e0f4ac709afdff88be1de62f34f3d5ccc
 -f41f18b1c3c950565ee3c237aebb51cfc3241813c6425813a8217e07aa0153a6
++d106edb956bbe22bddc2c6e5bcdf4fb8f797794c725c2e359e3fa4b31d881843