From: dan <Dan Kennedy>
Date: Tue, 3 Dec 2024 19:30:14 +0000 (+0000)
Subject: Merge latest trunk into this branch.
X-Git-Tag: major-release~248^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99caf5de509c664dee74e5fcd2b77befe59f67f;p=thirdparty%2Fsqlite.git

Merge latest trunk into this branch.

FossilOrigin-Name: eb13b8b3ef67ca8a252f7a4fd5a83ed31fefe68aa5ad8693d9d1f17218f4d176
---

c99caf5de509c664dee74e5fcd2b77befe59f67f
diff --cc manifest
index 6828a73854,72a90586a4..0f87538b06
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Further\stest\sfile\stweaks\sto\srun\swith\sSQLITE_OS_WINRT\sbuilds.
- D 2024-12-03T19:09:54.391
 -C Improve\sthe\soutput\sfrom\sthe\s".testctrl\sopt"\scommand\sin\sthe\sCLI.
 -D 2024-12-02T19:55:39.686
++C Merge\slatest\strunk\sinto\sthis\sbranch.
++D 2024-12-03T19:30:14.226
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
- F Makefile.in 85f2c740cadf969abbd9a6210b8b76636dbf231b9d3efe977b060c3055fac5b9
+ F Makefile.in 86e81bdb118bf332a27865090b7dce96ddde93c2f1586e1b911569acaa228f19
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 -F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312
 +F Makefile.msc 9a975438b8e06da44bc169b74aa9601cd48da52abd2c88e8a349c7d82b59d250
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -2199,8 -2202,8 +2202,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 5994656074b2db2c172f4c690c3b40cadd12e91d737fb91a03268148f8b49421
- R d48df35453e034ecc17b4554259c436f
 -P bdd408a2557ff05c9ea962a94b442f7c078d8e1ec27035aa95bc23d4d2bd5606
 -R 3b9b24c843f161d7a50bbe824bc3a3d8
 -U drh
 -Z 5d7beb581213ea354b6d427078135558
++P 54853421ba012c192ee2a41873e6ba10e187a6ec2e23182ccbec56864604166f de7064d118c33aab0fff39d072593b287c291870b843d093045300bde464420f
++R 3c243a933b362fd80871bde637111a1b
 +U dan
- Z f2d0671bca92e4f8a85f640b4aa16212
++Z 9f9402747ee81462cbb1b0010bd49025
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index d8e5d8ebae,85c6e4778b..30c13113b4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 54853421ba012c192ee2a41873e6ba10e187a6ec2e23182ccbec56864604166f
 -de7064d118c33aab0fff39d072593b287c291870b843d093045300bde464420f
++eb13b8b3ef67ca8a252f7a4fd5a83ed31fefe68aa5ad8693d9d1f17218f4d176