From: drh <>
Date: Thu, 6 Nov 2025 13:25:40 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the qrf branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb69edd23dc7c431c744574dbf331e03053b9513;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the qrf branch.

FossilOrigin-Name: 4e2ada6ad8a56d00aeb73570dc4ee22c484b65b8100a42a7085414d0a4c68afd
---

cb69edd23dc7c431c744574dbf331e03053b9513
diff --cc manifest
index 1a3d684092,a9e7235b5b..ae0af8f97c
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C More\stest\scases\sand\sa\sbug\sfix.
- D 2025-11-05T22:48:33.983
 -C Get\sthe\ssqlite3Hwtime()\sfunction\sworking\son\sARM.\s\sEnable\sscanstatus\sby\ndefault\son\sWindows\sCLI\sbuilds.
 -D 2025-11-06T13:19:50.494
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sqrf\sbranch.
++D 2025-11-06T13:25:40.029
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md 6bc480fc673fb4acbc4094e77edb326267dd460162d7723c7f30bee2d3d9e97d
  F Makefile.in 3ce07126d7e87c7464301482e161fdae6a51d0a2aa06b200b8f0000ef4d6163b
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc 3eb1f6be1950c8a5535f0a6e17836fe18e57fb6ddb7a1a5985a3ec8f81deff97
 -F Makefile.msc 523bab2f6569e912a0aaf2d13e0b3f9bcb36d52310b236d950b354068c9de3f3
++F Makefile.msc d6b89223071f1964940c8d311236ff37533fd5a674b46f47e01a617b40688357
  F README.md dae499194b75deed76a13a4a83c82493f2530331882d7dfe5754d63287d3f8f7
  F VERSION 16eddb43056a79c1977427ab7a05f3457c373fa159dcdced8754eb89ce7e06b8
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -2173,8 -2167,8 +2173,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P d6b1bac15a692a69f3707fca721b57b3b283edb3850efa34ba42b02c3669fc71
- R acc04002a644080623c1a504bf28fb0e
 -P 5f3e883d180d6fb7a1909df284713170f5431ea7afcc1a3eb5912c4620df42b2
 -R 5e954180f1b873a8a9007a0afd69dc4d
++P 9a9c4580772fa35a68b3e27a40fc9bc615144979dfd27b1054538e29a489c024 305bb022368bac9fafd7c2794762299324796903aaea270923d07f2127d8926c
++R 7930f95caf614489786b62ded9bfb23b
  U drh
- Z 01fd439849736e72d304f40ceb50953f
 -Z 361ce28981b1f78be7d6cda7aa08e272
++Z 84a722bb644539f8dee173b588bffd78
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 045c236b9a,20c570fe60..a41265b16d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9a9c4580772fa35a68b3e27a40fc9bc615144979dfd27b1054538e29a489c024
 -305bb022368bac9fafd7c2794762299324796903aaea270923d07f2127d8926c
++4e2ada6ad8a56d00aeb73570dc4ee22c484b65b8100a42a7085414d0a4c68afd