From: stephan <stephan@noemail.net>
Date: Mon, 21 Oct 2024 13:11:43 +0000 (+0000)
Subject: Merge trunk into autosetup branch.
X-Git-Tag: major-relase~351^2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d54bae947d0d16d7cfb4687399de5120d4681fd2;p=thirdparty%2Fsqlite.git

Merge trunk into autosetup branch.

FossilOrigin-Name: 347a50e66fa17bba997f6cbaa5bd693d029df488e54c24f7e4db47b65e84ce81
---

d54bae947d0d16d7cfb4687399de5120d4681fd2
diff --cc manifest
index d942e56b06,039c042011..bb21f1d2b6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Build\sdoc\stouchups.
- D 2024-10-20T02:47:56.420
 -C Avoid\susing\sLIKE\sin\ssqlite3expert.c,\sin\scase\s"PRAGMA\scase_sensitive_like"\shas\sbeen\sused\sor\sthe\s"like"\sUDF\sreplaced\sby\ssomething\sunexpected.
 -D 2024-10-21T10:47:24.220
++C Merge\strunk\sinto\sautosetup\sbranch.
++D 2024-10-21T13:11:43.662
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2240,8 -2219,8 +2240,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 c6c799a54b3fad2f8c2b73b0a88f64dda38736a283bbf4dd286ac9dd6d6bf153
- R c96bca98bb7bd5eb71921b8f1e5fa399
 -P 7a7162293c8fdb0078fe56948d697703539dd23273b2072990d4391c761e6ae2
 -R 9a25b364d37dfe1d99d32efb1c760e91
 -U dan
 -Z 4dfdbcd58f369b4095a2bf4d76d23cc9
++P 109d441bf1bcdbc01d1f3f2aa145039539fc5aad02f91fc987a0c3702e21809d 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a
++R efd09ae4017e3cac1b5cf47493ec2640
 +U stephan
- Z af40e261971f2302deaf71840d9cb2e5
++Z 9f0bf45ab85b7fbd154d377a0233cf43
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6cc2e7ff7a,b0a2f034c5..5807b3fb2d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 109d441bf1bcdbc01d1f3f2aa145039539fc5aad02f91fc987a0c3702e21809d
 -9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a
++347a50e66fa17bba997f6cbaa5bd693d029df488e54c24f7e4db47b65e84ce81