Merge the latest 3.42.0 beta changes into the wal2 branch.

FossilOrigin-Name: 771361e19e5b7f944cd2cfecb064b39175b892148fa877b763170744bca0b0cf

diff --git a/manifest b/manifest
index fd0000778cd060e646b92370e7640c1066838b6b..faaff78773fa24b321669d97d22c86b9e40a2fdb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthis\sbranch\swith\slatest\schanges\sfrom\strunk.
-D 2023-05-04T14:31:17.113
+C Merge\sthe\slatest\s3.42.0\sbeta\schanges\sinto\sthe\swal2\sbranch.
+D 2023-05-13T15:00:47.430
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2082,8 +2082,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0215dcc76d7b3a1dad10b8e6fd8b54f2ab5006a156db5cee992ab2dac98d9284 d3370d59cffb7ab982d6c620c93d22aa6a9dc786e1c4af95ca8d45ff0b9b7d6f
+P 49777032f29517d23c8c7483536f8ba828e7000dc303415da6881cc458620be2
 R 4c52475278c5ccef59c6ec833b8f6544
-U dan
-Z f87e8c5c1721799925f2f360f33a9b2f
+U drh
+Z a8e26bfa96688ebb06d100956a914e43
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2838b6d8b0f89f8b5d6acd202d19b8632cca72be..dbcd97d845073b922783b5191be2f3e5d103e0b9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49777032f29517d23c8c7483536f8ba828e7000dc303415da6881cc458620be2
\ No newline at end of file
+771361e19e5b7f944cd2cfecb064b39175b892148fa877b763170744bca0b0cf
\ No newline at end of file