From: stephan <stephan@noemail.net>
Date: Tue, 6 Sep 2022 09:59:06 +0000 (+0000)
Subject: Merge trunk into fiddle-opfs branch.
X-Git-Tag: version-3.40.0~169^2~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae1ed83831d9cb6026a15d30d43a309bf3fd758f;p=thirdparty%2Fsqlite.git

Merge trunk into fiddle-opfs branch.

FossilOrigin-Name: 7f76eaec793720db87415a476ddf539bc4dea3e74c8e5406d6739206aebdacc2
---

ae1ed83831d9cb6026a15d30d43a309bf3fd758f
diff --cc manifest
index b8a3ffbcd5,e6d926c22b..8171ff2ddc
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\scleanups\sin\sOO\sAPI\s#1.\sAdd\sSudoku\sSQL\sto\sbatch-runner.js's\slist.
- D 2022-09-05T13:24:08.577
 -C Add\sthe\stool/omittest-msvc.tcl\sscript\sthat\swill\stry\sto\sbuild\susing\sMSVC\nusing\svarious\scompile-time\soptions,\sto\sensure\sthat\sthe\scompile-time\soptions\nall\sbuild\swithout\serrors.
 -D 2022-09-05T22:54:36.015
++C Merge\strunk\sinto\sfiddle-opfs\sbranch.
++D 2022-09-06T09:59:06.910
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2014,8 -2000,9 +2015,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 36ceef94e1935f5e85f79e489cd0ed265a77820fb68329c190794df5e076bf84
- R 7441dbef21a285816a3b01822ba89eea
 -P f74a5ea8c986dc33d3afcda169c38abbe55728c56716cf9991a5e2ef7fc4917a 82b89f8a074858a81d841dfc26436e8d39ce4907b8f989eba4d848db16758303
 -R 6ca49c20c002174082011fae5352b9a2
 -T +closed 82b89f8a074858a81d841dfc26436e8d39ce4907b8f989eba4d848db16758303
 -U drh
 -Z 072f191f34018bff25742e9863a6762e
++P 4488cb5798f34cbba14eb8e2aa5da8420c14a85d37d278d357406aedd5c3a9e5 6b00ecb59fd303f7985902c35a46db9e729201d4beaedea46596b728d9e4b1c8
++R fe1e5247661b941e3cd5ee02be72aa3d
 +U stephan
- Z 1c45c40df6428914f663fd75d3ed35bb
++Z 52c5dac4d2eba4046599a7e7052e5fe2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 871f2346e9,1a48ad4407..c528b411f9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4488cb5798f34cbba14eb8e2aa5da8420c14a85d37d278d357406aedd5c3a9e5
 -6b00ecb59fd303f7985902c35a46db9e729201d4beaedea46596b728d9e4b1c8
++7f76eaec793720db87415a476ddf539bc4dea3e74c8e5406d6739206aebdacc2