Merge trunk

FossilOrigin-Name: 436a01e1b13e1fdb2d4d45b8614853cc2b3c2a1fbfe68a08984e15a50178cf3e

diff --cc autosetup/sqlite-config.tcl
Simple merge

diff --cc manifest
index 3b7dd2f61b446de9a70f7984ef7cc01fcf12d564,aeb3cf252f67cbc8c86aa3089db4e0e637f839da..0656488ea7fcdaa21112635f9debc4ac01ebc8fa
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C The\swin32lock\sand\swin32longpath\stests\sdon't\swork\son\sCygwin
 -D 2025-04-04T13:23:03.839
 +C Merge\strunk
- D 2025-04-04T06:49:24.262
++D 2025-04-04T13:25:04.854
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -51,8 -51,8 +51,8 @@@ F autosetup/cc.tcl c0fcc50ca91deff8741e
  F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
  F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
- F autosetup/proj.tcl dfead6099674665c1b59f54e740b47bc6d00dded5e58460528140725fefcb4bf
- F autosetup/sqlite-config.tcl 6b3cf6fb38a4cdf95cb5e9a5a20d5def4c42e17c9b76af7690eb3c07648641a4
+ F autosetup/proj.tcl 89b1822a66b4d6a286c959b3c26093e35926bf86db56cc1887ddcb130001f76a
 -F autosetup/sqlite-config.tcl 858c567f0b945e690c693c8e0860ae591596e9221760de643d3f4c1a46ce238c
++F autosetup/sqlite-config.tcl 168b787d872d1d72e0772ac91e1c27cdb0fb2ae59cfb0b15326132ec18ef1ca9
  F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
  F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
  F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@@ -2216,8 -2216,8 +2216,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 5cf5d2cedf3ea9879cc2162644e318dc7a23c2effefc381e3905a51f3643b1e4 357563bc7c01a744d4038ed3ccc475260b819e98cf90a4270764f79c73d2497e
- R 8687e1b53a25d6ff405a3aab0cc09c9c
 -P 244c2b75c10c68bc0499d60b707a925836a4b9d490813785587522109fc11fe2
 -R dd73bc19146d018b472217465906040b
++P 79dfaf05b81a5d83042251429ec97d6f3d6a596965ac345a9112f174d6447ee6 32ef3f26e7fb34dfdb23617a19bb9baa2e4c3dca564a88850b58a0fbe6446cf8
++R 94fc1dae596561509520ba3a4ec99696
  U jan.nijtmans
- Z b843279799f6ce4cf1d810e15cf6260d
 -Z 0a9d51a17f8a004b247523e8da988010
++Z d5cd01cf9b829dbba3a0a9e923ea0e7e
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 9f1ad9f9133f5fefdb6fe4bffcb1ab3cbe0099e0,0d33878e2b5ac42a5d87dd26ba5cd398849f9f22..4ab11a0eb8d0ec813142a8ffb55abd778a20aeb8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 79dfaf05b81a5d83042251429ec97d6f3d6a596965ac345a9112f174d6447ee6
 -32ef3f26e7fb34dfdb23617a19bb9baa2e4c3dca564a88850b58a0fbe6446cf8
++436a01e1b13e1fdb2d4d45b8614853cc2b3c2a1fbfe68a08984e15a50178cf3e