From: stephan <stephan@noemail.net>
Date: Sat, 17 May 2025 17:15:49 +0000 (+0000)
Subject: Merge trunk into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f62ae820a6993f10b1dd9fe0cbfe3d487b0869d2;p=thirdparty%2Fsqlite.git

Merge trunk into this branch.

FossilOrigin-Name: 58dd6d94e5c62e649ef89fdf363759bf329f6a8fd882dbf8f543ea7b26eb77c8
---

f62ae820a6993f10b1dd9fe0cbfe3d487b0869d2
diff --cc manifest
index 0fff8ea257,a900f60fc5..ebc5126a36
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Account\sfor\sTcl\s8.x's\slack\sof\sTcl_BounceRefCount().
- D 2025-05-05T23:44:41.305
 -C Latest\steaish\spieces,\smost\ssignificantly\sfor\stcl\sportability\sfixes.\sMove\sautoconf/teaish/autosetup/...\sto\sautosetup/teaish/.\sto\ssimplify\smaintenance\sand\sdeployment\svia\sthe\sautoconf\sbundle.
 -D 2025-05-17T11:06:02.899
++C Merge\strunk\sinto\sthis\sbranch.
++D 2025-05-17T17:15:49.390
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2207,8 -2207,9 +2207,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5368647a1f3f97c34c5d1f6dc406e62cd19fda28005c610bc789ce89dd7b58e6
- R e6273f233b27c1921198b3367234508c
 -P 036c97e36cb36a2ac765a8e8539433dcb63f69155d4c24857f84faa44eed6eb5 43259e8c3fab13b4597cdd1c670df00ec756a6fefdeb7d4ba2e0644e4ad47113
 -R 39ca8780111060790d2845d7852fde6d
 -T +closed 43259e8c3fab13b4597cdd1c670df00ec756a6fefdeb7d4ba2e0644e4ad47113 Closed\sby\sintegrate-merge.
++P 46b0bf5603251748bbb48451d6a80f8e0596f5eff3ff62cebba0060cec6cdbe8 381d3e82e831bedee56108fb585880d802c4d7d50b0804d909a33ff15a3be185
++R 8f6311457ff6a65c71b83fedadd1a4de
  U stephan
- Z e21b217289727fd9e120dd35bac451dc
 -Z b3892a2462d40bd10e662612ff769df0
++Z 7aa091f3d2a44c39fddb4453372d06f2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 3a3cd03cc9,6c9528e1c1..7cf97ae905
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 46b0bf5603251748bbb48451d6a80f8e0596f5eff3ff62cebba0060cec6cdbe8
 -381d3e82e831bedee56108fb585880d802c4d7d50b0804d909a33ff15a3be185
++58dd6d94e5c62e649ef89fdf363759bf329f6a8fd882dbf8f543ea7b26eb77c8