From: drh <>
Date: Tue, 10 Oct 2023 17:34:41 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc5e612db4b4bc41dae2cff04c168bcb9a5fdd2e;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the jsonb branch.

FossilOrigin-Name: f93f16c94d0a58dfa90939e84aba048be958c7b085b45a6f25c2243fdf79b3aa
---

cc5e612db4b4bc41dae2cff04c168bcb9a5fdd2e
diff --cc manifest
index 3959f0c228,afe0936b4a..592f7c39e5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Systematize\sthe\snames\sof\ssome\sof\sthe\stranslation\sfunction\sin\sthe\sJSON\nimplementation.
- D 2023-10-09T18:33:01.568
 -C Fix\sa\sbug\sin\sthe\smkautoconfamal.sh\sscript,\sintroduced\sby\scheck-in\s[3308fdda4b81c110]\nso\sthat\sthe\s"snapshot-tarball"\sand\s"amalgamation-tarball"\smakefile\stargets\nwork\sagain\swhen\srun\sfrom\soutside\sof\sthe\ssource\stree.
 -D 2023-10-10T15:33:05.058
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sjsonb\sbranch.
++D 2023-10-10T17:34:41.118
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2128,8 -2128,8 +2129,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9422c24f4a8b290dcae61e50ec81be5b314b22c61a2bca1e194e47da1316b6e6
- R 3ec6096d3289810ffc9770092e31c712
 -P 0177f4dfe8a5c03c1d5dd279c6babe5a87b596c2351373f845b89fc6abf7947b
 -R 37373df44eb3bf4c68a7092e403d96f0
++P db44bd1d62084ef69c808f7d07e0a25d5a089dcb8b98b1b5d026777591bbdefc 65ccf5fef812d43aed9e00af36c90e1a499d197e30148753790445e25ee1324c
++R 7120be3e2682c2f2dc1a6290819c2e25
  U drh
- Z 411045c6779d7c6439ce2a3295f7e71a
 -Z 33418d47ecf8795ddbe386dcc10d96d2
++Z a077701d7ef896cae6a827ec97befa72
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 533952e38f,6472fbbabb..53e25911e6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- db44bd1d62084ef69c808f7d07e0a25d5a089dcb8b98b1b5d026777591bbdefc
 -65ccf5fef812d43aed9e00af36c90e1a499d197e30148753790445e25ee1324c
++f93f16c94d0a58dfa90939e84aba048be958c7b085b45a6f25c2243fdf79b3aa