From: stephan <stephan@noemail.net>
Date: Fri, 31 Jan 2025 12:39:07 +0000 (+0000)
Subject: Merge trunk into opfs-sahpool-pause branch.
X-Git-Tag: major-release~259^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4bfa3465e78cd852506e9c28a733c45d9eec32e;p=thirdparty%2Fsqlite.git

Merge trunk into opfs-sahpool-pause branch.

FossilOrigin-Name: 775a547eca2b0b3dbb6c03990236128a095cc34d28caec44b9a5072510c75b63
---

d4bfa3465e78cd852506e9c28a733c45d9eec32e
diff --cc manifest
index e02024cfb4,6fe6f41613..78d794bcbc
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Simplify\show\sOpfsSAHPoolUtil.unpauseVfs()'s\sreturned\spromise\sis\shandled.
- D 2025-01-29T11:28:18.640
 -C Minor\swasm-specific\sdoc\stouchups.
 -D 2025-01-31T12:30:37.066
++C Merge\strunk\sinto\sopfs-sahpool-pause\sbranch.
++D 2025-01-31T12:39:07.019
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2209,8 -2209,8 +2209,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 1d2683fe9e4be01c3137e750900f54d287e7d96185e66924d24b50f4647e7ef1
- R 66a514dac494b6089e61caf69206dcd1
 -P f66efd5b531210407ee8f30cdf6684a7610479fd8810a609c54469f7424a0644
 -R ee4ef9a21aa00ca447e26df7a5840479
++P d651b8da5a84cd54d71f15bd34e4db685674ef73f26f5cc26b7af5321a2ec05e 56b618da9073db8b8d5dafa177a3c9e4c4d927bf512e14b0e6d23937f91ce4cf
++R 0de3f6553f08e8afe4528e7b192214df
  U stephan
- Z 0fe942552ec304dc399f25e3701534d9
 -Z effbdee03a11b5ac430008ff904c3705
++Z 411d369a110121e7891ed7e96e9dfba9
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 056d267bf5,b55f345c59..49b6367688
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d651b8da5a84cd54d71f15bd34e4db685674ef73f26f5cc26b7af5321a2ec05e
 -56b618da9073db8b8d5dafa177a3c9e4c4d927bf512e14b0e6d23937f91ce4cf
++775a547eca2b0b3dbb6c03990236128a095cc34d28caec44b9a5072510c75b63