From: dan <Dan Kennedy>
Date: Mon, 19 Aug 2024 10:40:08 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Tag: version-3.47.0~220^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffts5-locale;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: 6787603bd0d8117e41e6b572c0d7cada0f6d7266a4ff2ad79f9471b9beb28a9e
---

f5b1c3da36de28e9880a09ca605b06fa9f6b8d2d
diff --cc manifest
index 9d907ad392,15c9bb1203..bcc136c113
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\swith\sdetail=none,\scontent=''\stables.
- D 2024-08-18T14:46:13.208
 -C Automatically\sdisable\sdirectory\sfsync\swhen\scompiling\sfor\sAIX.
 -D 2024-08-18T09:53:37.962
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-08-19T10:40:08.075
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2209,8 -2205,8 +2209,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 01116e32797e1b127ba79059d890fbe5075eee2b6e3ce4468e82862b0fc3aa46
- R 502de970004bd002cb48fa6eef375d2c
 -P a4043cbeb8a08fca2fdd2ea703e030d3a5574cc6002292ecc6f0e88c116472a3
 -R cd57173ec450b44036cf8242b7c2fe1f
 -U drh
 -Z a06494827a8461d8ba3867ea1f761ae1
++P 4b8070816ada3f269d53c9cee20669f59e19a23c31c8509fc397c21dd097ec9f 8d170e07e20c21a5bb97fdc8c2d01d92178f5fe740e60d203e4621747cfce33e
++R 82cb800b448c241dbfbc7da999244641
 +U dan
- Z 7efc0e935f060687a4e12ab8572c886e
++Z 03e11359afca301562b37a47612ec842
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 43ca2661de,1dca61d1bd..56b855f779
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4b8070816ada3f269d53c9cee20669f59e19a23c31c8509fc397c21dd097ec9f
 -8d170e07e20c21a5bb97fdc8c2d01d92178f5fe740e60d203e4621747cfce33e
++6787603bd0d8117e41e6b572c0d7cada0f6d7266a4ff2ad79f9471b9beb28a9e