From: dan <Dan Kennedy>
Date: Wed, 6 Dec 2023 14:30:34 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Tag: version-3.45.0~114^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39b08db132ffcb70a702527cddc8576d43c1103e;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: 8f46eace86e7b2e556913575aa3cd6f7987ac0efcc880f0af649d42c253aeb81
---

39b08db132ffcb70a702527cddc8576d43c1103e
diff --cc manifest
index 91a29a053c,6d47dd3e83..3ea91fa0af
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\stests\sfor\sthe\snew\scode\son\sthis\sbranch.
- D 2023-12-05T18:36:23.618
 -C README.md\stypo\sfix\sreported\sin\sthe\sforum\sand\supdate\sall\slinks\sfrom\shttp:\sto\shttps:.
 -D 2023-12-06T12:30:28.174
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2023-12-06T14:30:34.010
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2151,8 -2147,8 +2153,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 8582707f16133f003a6687f68cbea03d4eb6c2a0e2e07746b7cace0c44e84fa4
- R c18539c880ee946e73119264163283e7
 -P 7f0c79b94e8f55e5013e52ba64ba8b32dad1dc4e2224d2099733cbc561de1810
 -R e4c4253b529b92ef6212320f71e1570e
 -U stephan
 -Z 02e09a8447ded58f933fad2e169fffdc
++P 59d008b6c23ab900377bc696ee19381feb7614bac80546eae361e401c3620c4e 5c48acdbb44185b352b54911a57a6986d6c7e624bdeba2af48b985d29f0292bf
++R aee08254c1ed5ae187dbc54a7e67d0a2
 +U dan
- Z 86bd4754d1465fbe5cee9e784de6e900
++Z 4af5347745441ba205f194c56bf5dc11
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c1e3ee2ba4,f935efea29..aacb877b37
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 59d008b6c23ab900377bc696ee19381feb7614bac80546eae361e401c3620c4e
 -5c48acdbb44185b352b54911a57a6986d6c7e624bdeba2af48b985d29f0292bf
++8f46eace86e7b2e556913575aa3cd6f7987ac0efcc880f0af649d42c253aeb81