From: drh <>
Date: Thu, 27 Feb 2025 15:55:01 +0000 (+0000)
Subject: Merge back a sequence of three changes that were branched due to a build break.
X-Git-Tag: major-release~227
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=157d9276a0f0fa64ea9fc5e947d71294d035b708;p=thirdparty%2Fsqlite.git

Merge back a sequence of three changes that were branched due to a build break.

FossilOrigin-Name: 67809715977a5bad0ec7830e27746aba2080852eb725d471c0fd62d4f464a884
---

157d9276a0f0fa64ea9fc5e947d71294d035b708
diff --cc manifest
index 4aa106338a,7e62d659eb..8c7e122d01
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Test\stestrunner.tcl\sto\sidentify\san\smsys\senvironment.
- D 2025-02-26T18:31:42.955
 -C Fix\sbuild\sbreak\sin\s[e2bd23f251359e7a].
 -D 2025-02-27T15:52:15.208
++C Merge\sback\sa\ssequence\sof\sthree\schanges\sthat\swere\sbranched\sdue\sto\sa\sbuild\sbreak.
++D 2025-02-27T15:55:01.063
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2213,8 -2213,8 +2213,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P cd2a84a72c922c330441d6b75df0c8b2f6df2c25bc7c37ac37046fffd702624a
- R cad412104842ae0984e52f17376b1122
- U stephan
- Z 1cdc970f41ca3a38b977f41ad6f349cb
 -P 3cf88d429f6e7c10b8f19c283151541924c4bb84bbd0d2e05cabdd4f9f0e88c9
++P e9f777ceda9fca51c37caca0afeadfc3f99b86e945496f52c71adcc520dcee98 6ed84211033ee0ff00c8fd088979fe06d3a264e4f935162f36a62c00af135c63
+ R a7e661399baadc74a19d1d0659fe985b
++T +closed 6ed84211033ee0ff00c8fd088979fe06d3a264e4f935162f36a62c00af135c63
+ U drh
 -Z edf03ff042d345a172b9412ca4da75aa
++Z aba31a06453c95b6e43f522af834d97f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 42bbd9c7d8,8e9ed1b1f7..9008ffd244
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e9f777ceda9fca51c37caca0afeadfc3f99b86e945496f52c71adcc520dcee98
 -6ed84211033ee0ff00c8fd088979fe06d3a264e4f935162f36a62c00af135c63
++67809715977a5bad0ec7830e27746aba2080852eb725d471c0fd62d4f464a884