]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge trunk changes into this branch.
authordan <Dan Kennedy>
Fri, 27 Sep 2024 11:35:22 +0000 (11:35 +0000)
committerdan <Dan Kennedy>
Fri, 27 Sep 2024 11:35:22 +0000 (11:35 +0000)
FossilOrigin-Name: 4a26a4e0015bc42b1d007def3750caf7baefe429270a295cc2f4499c98c07247

1  2 
manifest
manifest.uuid

diff --cc manifest
index 0daa473be97ac2a3b1f9214e6add1d96e79c66bc,68ea64dcf294d97a31188e7889f7010300433f2f..2888f0d958fc1f4b96f2295efd9ccd7589975441
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Allow\sUPDATEs\sof\sunindexed\scolumns\sin\sfts5\scontentless_unindexed=1\stables.\sTesting\sto\scome.
- D 2024-09-27T10:57:41.777
 -C Fix\sa\sharmless\scompiler\swarning\sin\sthe\sCLI.
 -D 2024-09-26T22:25:13.188
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-09-27T11:35:22.006
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2213,8 -2215,8 +2216,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 21539e9d0d57fdc762affbce9220d1bb1ca009d9dc751b4ccfe63eecbbe2f575
- R de377aee83cef1249306ac8b9c4a8126
 -P f97f9944b829a49da12786f934da0a5ad51591afd6d8a19a4a0835f51bbdbff2
 -R a6968f0fc463c15c807b790b3704b8a0
 -U drh
 -Z 47d3a59057a462e974fa3c72ad894820
++P cd36d66c88d7282eb0a3ccde5713253f72f5843e451b2693b71adfdae28b41fb 27ef1909bb0c4d9470c6074b40500632c68341127a079a3eb3b6a19dbfb2aeac
++R af6ff70b1f29deaae408cb2f001619bf
 +U dan
- Z cfbbba283553b2d6b64e253eb6c401a0
++Z 395c4e3ba81ec86081df96a010608d77
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 28116b337f366aedf71f0e9e23b825b05f9e5e6c,edb083fd58d12cd84035e8b011354eebd70fd166..918835070393826be9ec45abc0a1f5f8350c8ead
@@@ -1,1 -1,1 +1,1 @@@
- cd36d66c88d7282eb0a3ccde5713253f72f5843e451b2693b71adfdae28b41fb
 -27ef1909bb0c4d9470c6074b40500632c68341127a079a3eb3b6a19dbfb2aeac
++4a26a4e0015bc42b1d007def3750caf7baefe429270a295cc2f4499c98c07247