From: drh <> Date: Wed, 16 Nov 2022 16:00:43 +0000 (+0000) Subject: Merge the 3.40.0 release into the wal2 branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce8a1720d63d2a8f23cd750ed7f63f8f8e0488d0;p=thirdparty%2Fsqlite.git Merge the 3.40.0 release into the wal2 branch. FossilOrigin-Name: 2df915ef04a64cc8027330013f73ac0ee1fee8cb6eb61f3a608c21ea419d5928 --- ce8a1720d63d2a8f23cd750ed7f63f8f8e0488d0 diff --cc manifest index 914e6c25c9,a86d2fe408..46b3e62db7 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\swal2\sbranch. - D 2022-11-14T13:10:42.959 -C Version\s3.40.0 -D 2022-11-16T12:10:08.388 ++C Merge\sthe\s3.40.0\srelease\sinto\sthe\swal2\sbranch. ++D 2022-11-16T16:00:43.308 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -2069,8 -2055,11 +2069,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 ca63a1bee16d30677c20c7576361dfb9a359e6e1b2b2b58a574da0059d3a8822 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c - R 18495764295620ba5114f10b8d4ae59a -P 6ee57a2e4e3399481100c40da0229d2d33cbe3290016185c8a60839d14b209f6 -R 05517d79d8355d06966e47ba4dd15a19 -T +sym-major-release * -T +sym-release * -T +sym-version-3.40.0 * ++P a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318 ++R 7db376bcbace3b564ff46d50ac971aba U drh - Z 689cb11bdb8407f60825c9d50a7fd9fb -Z ec924bc422a55f57f049fa2ef8df3b06 ++Z b4d0c87deafe46748ff8025efaed08c3 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 9443f65f1b,5a7c4d607e..fcf816135d --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387 -89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318 ++2df915ef04a64cc8027330013f73ac0ee1fee8cb6eb61f3a608c21ea419d5928