From: larrybr <larrybr@noemail.net>
Date: Sat, 6 Mar 2021 23:49:18 +0000 (+0000)
Subject: Merge from trunk.
X-Git-Tag: version-3.35.0~32^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2e9640155de744b33877693d2bb55562aaa7705;p=thirdparty%2Fsqlite.git

Merge from trunk.

FossilOrigin-Name: 729117cdfa2d6ff24b66656e9ccc380199606b830fc338286e4dd10e8e787597
---

b2e9640155de744b33877693d2bb55562aaa7705
diff --cc manifest
index 229b9a93a1,20d179021a..981b78f9b7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Create\sinitial\stests\sfor\sappendvfs,\sand\smake\sit\savailable\sas\sa\sstatically\sloaded\sextension.
- D 2021-03-06T23:36:47.524
 -C Limit\sparenthesis\snesting\sdepth\sin\sFTS3\sexpressions\sto\nSQLITE_MAX_EXPR_DEPTH.
 -D 2021-03-06T15:13:26.136
++C Merge\sfrom\strunk.
++D 2021-03-06T23:49:18.484
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1910,7 -1909,7 +1910,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 1d67ed1c98a6bc49cce6bdc156bd6f22b3f37d33226bd62430a43aa5318f5781
- R 0eeba06122e9adb743a0f3263a3e03e9
 -P 01eae68e85b31b7a9f08733459765bbd9bf9dad592bf64f10fc2fa32e02a89c2
 -R 02b7be7b0db655498be572d780795257
 -U drh
 -Z 8b3ef9b5e97e19a6fa18878f5257830d
++P 9f33d45179f5985bd4c4f7582e94f5833a63f853c8cdc19f39cf7e3ee70177d0 5ddd8032ef9ecd5b53909d304c8f1375a72f270fd7810964cb4e385e25bedd4f
++R cbc59f10ccb84702beac2fcfd70d381a
 +U larrybr
- Z 120f7ec5fcb8ab1d7c797ea6341bc2db
++Z b57dd333b8789a25a8927f035a04d7d3
diff --cc manifest.uuid
index 07e1e5982f,e9ca6e7784..6d705275ad
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9f33d45179f5985bd4c4f7582e94f5833a63f853c8cdc19f39cf7e3ee70177d0
 -5ddd8032ef9ecd5b53909d304c8f1375a72f270fd7810964cb4e385e25bedd4f
++729117cdfa2d6ff24b66656e9ccc380199606b830fc338286e4dd10e8e787597