From: drh <>
Date: Tue, 12 Mar 2024 12:00:22 +0000 (+0000)
Subject: Merge all 3.45.2 pages into the bedrock-3.45 subbranch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa1d266367d633d7a9bef93fbc36c93f9abc731;p=thirdparty%2Fsqlite.git

Merge all 3.45.2 pages into the bedrock-3.45 subbranch.

FossilOrigin-Name: 33b9cf7c1086c8af72205cff586f1b2a6d495e1efa0f1de46b37019aac98edc9
---

4fa1d266367d633d7a9bef93fbc36c93f9abc731
diff --cc manifest
index a1226c6f63,fabc664667..6496f78964
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\sbranch-3.45\schanges\sinto\sthe\sbedrock-3.45\ssubbranch.
- D 2024-03-11T23:26:28.789
 -C Merge\sall\s3.45.2\spatches\sinto\sthe\swal2-3.45\ssubbranch.
 -D 2024-03-12T11:55:49.774
++C Merge\sall\s3.45.2\spages\sinto\sthe\sbedrock-3.45\ssubbranch.
++D 2024-03-12T12:00:22.391
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2197,8 -2174,8 +2197,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 5955853a86fabdd9cb69e9ade844a2bde41e32a79e7d00c755952701dc4dcba7 f8cee91f5d3eab534534c278146cf0876d54e467e7f51369b8e81c532ede9f54
- R aa5e779851dfe560a5dfdddfdbb31502
 -P f8cee91f5d3eab534534c278146cf0876d54e467e7f51369b8e81c532ede9f54 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77
 -R 67555f5b923d40a5f0024ab2d2987ebc
++P 516b7e13801f79afb120a0a708a553ad780d1b3ae636162ad50f14af996f8684 64d740c59499877ddb6eadaaefb86f191efab4760551d6a6bae80399018faff2
++R 1f2e6014b52e0c43d5147822c6b06d95
  U drh
- Z 2dde7c2417251c9b7a3a286e8feb3252
 -Z 9557d17902da57eb13d0bc2d6ff89d1c
++Z 5e99135d7c129b17414a4b0854d84632
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1c94abc646,89706067e0..e3a5b989d5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 516b7e13801f79afb120a0a708a553ad780d1b3ae636162ad50f14af996f8684
 -64d740c59499877ddb6eadaaefb86f191efab4760551d6a6bae80399018faff2
++33b9cf7c1086c8af72205cff586f1b2a6d495e1efa0f1de46b37019aac98edc9