From: dan <Dan Kennedy>
Date: Wed, 30 Oct 2024 11:21:55 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae2652721ba1ac950bac86bcc7476c5053daf428;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: 403e01b03c31349425fa2831285b5e8e2665d5779548b4ce581cbd781c4c61d9
---

ae2652721ba1ac950bac86bcc7476c5053daf428
diff --cc manifest
index 421bd2f9db,6eada24a54..ebf9d03586
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\sthat\scould\soccur\sif\sa\sread-only\sconnection\sswitches\sits\sjournal\smode\sfrom\s"persist"\sto\s"off"\sor\s"memory"\swhen\sthe\sfile-system\scontains\sa\shot-journal\screated\sby\sa\s"PRAGMA\sjournal_mode\s=\swal"\scommand.
- D 2024-10-30T11:21:15.367
 -C Clean\sup\sand\sadd\sdocs\sto\sthe\sTCL\svetting\ssteps.\sMake\swarning\sand\serror\smessages\sbold\sif\sstdout\sisatty.
 -D 2024-10-30T05:07:18.996
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2024-10-30T11:21:55.931
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@@ -2200,8 -2198,8 +2200,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 349b2d895752c087dae7b7019bc10ac21852309e96dbc5f29cd902d080421f83
- R 142e08af85c4632b2c9de45ebce0cdba
 -P 80584e165e4652e76cc3188befcee814f168298486743940bcf46696043686a0
 -R 9bc2e5e8de07dc365525bf3b51622805
 -U stephan
 -Z f36698e72a5599d183442b07666428fe
++P 85b5ed0253a84791dc263fa9fc672e340f223d785005e915e675c01054f90e0c 47157dcf9ec6b52b37578bcd5dc5ace8c36e62c8ca2625c94252c15db784b115
++R df31c3e6f1a10e7e6597644d89acb06d
 +U dan
- Z aae4ab573ece66625e6797d5301520ab
++Z 3099c79c517e8a8194527164f3707392
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 735a5daad8,3d887f1a00..1897f0f538
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85b5ed0253a84791dc263fa9fc672e340f223d785005e915e675c01054f90e0c
 -47157dcf9ec6b52b37578bcd5dc5ace8c36e62c8ca2625c94252c15db784b115
++403e01b03c31349425fa2831285b5e8e2665d5779548b4ce581cbd781c4c61d9