From: stephan <stephan@noemail.net>
Date: Fri, 27 Sep 2024 16:43:47 +0000 (+0000)
Subject: Merge trunk into the autosetup branch.
X-Git-Tag: major-relase~351^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cb46bd929444575c7dddfd50fd9596e99dd9890;p=thirdparty%2Fsqlite.git

Merge trunk into the autosetup branch.

FossilOrigin-Name: 9586ea204c705430d63e3757f80009a152b89573a75c6862e407062be8ef346c
---

3cb46bd929444575c7dddfd50fd9596e99dd9890
diff --cc manifest
index bf80bfb4cb,00d8d3f66e..5fdef80811
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Add\sbasic\slibreadline\sdetection\sand\sbuild\sCLI\sshell.
- D 2024-09-27T13:29:50.775
 -C Squash\ssign-comparison\swarnings\sreported\sin\s[forum:5e605a763a65c3f8\s|\sforum\spost\s5e605a763a65c3f8].
 -D 2024-09-27T16:20:03.346
++C Merge\strunk\sinto\sthe\sautosetup\sbranch.
++D 2024-09-27T16:43:47.997
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 6a826facc78c3c8ad38bf00ed588f6aa3665ccd7a9749b891d20582fc290c77e
 +F Makefile.in 5253a425c9167286a21b2393d4293c197914c135e35ef3fdea7b1334df98c9cc
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc e3c4723c27464acc31da4420b808c8d2690180ba2b915897bece0a9d5d2cecf6
+ F Makefile.msc 9c6d80d9d103fa42e931f4c464884a5e577fae8563acc7589bff4e43fbe8f864
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -2233,8 -2215,8 +2235,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P a290e3b15de75f6a0a4975b5747449525fb2b58b3947b8ca0ab64a4d3cca228e
- R 00136067f886dfec24f53eea1a13e92a
 -P 27ef1909bb0c4d9470c6074b40500632c68341127a079a3eb3b6a19dbfb2aeac
 -R 81a4d040bd5425cfeac10fd5ca0ed96b
++P 2ba7ab562580667bc9249f2d1f2402c605553d5583eec497398abe6d196c83d4 e74fce93c518296bdb0a4273cd5fd3f785d37d27750ca456b61a3502135775f9
++R 3c6bafdb85fa1f8ab78b8ac701bcd805
  U stephan
- Z 89712eb4fe24753b96ac2cf6bb7cec31
 -Z 6359f322b683086f026c8375d9816233
++Z 88ba7ef11f9b2b829b9801a6f6a0aad2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a944e85909,40b51b8191..a86e69ad50
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2ba7ab562580667bc9249f2d1f2402c605553d5583eec497398abe6d196c83d4
 -e74fce93c518296bdb0a4273cd5fd3f785d37d27750ca456b61a3502135775f9
++9586ea204c705430d63e3757f80009a152b89573a75c6862e407062be8ef346c