From: drh <> Date: Fri, 12 Mar 2021 17:08:43 +0000 (+0000) Subject: Merge the 3.35.0 release into the wal2 branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e809deee13054075eb99a41d327d98b63acc08d2;p=thirdparty%2Fsqlite.git Merge the 3.35.0 release into the wal2 branch. FossilOrigin-Name: 03142e5f760ef46c7837fef1b21f54baf64f4b9d99d1c9e3f4d8d6c8d1ab875f --- e809deee13054075eb99a41d327d98b63acc08d2 diff --cc manifest index a02d4cb973,3a658ff085..ffe476cb80 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\slatest\strunk\schanges\sinto\sthis\sbranch. - D 2021-03-11T19:42:05.522 -C Version\s3.35.0 -D 2021-03-12T15:10:09.783 ++C Merge\sthe\s3.35.0\srelease\sinto\sthe\swal2\sbranch. ++D 2021-03-12T17:08:43.311 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -1922,7 -1910,10 +1922,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 0ae81039083dbeb67cd4da9f56cdcb31fd747ba258179a46781a12b2872e9f49 07150cf15ad36c7fc681a911f66db23d610ddf110a7be7f1fcefbd8750cd135a - R f35fa1eb60acc42b898e30668bf9d094 - U dan - Z ec916f0c90a91f2a98f03a114f76e5b1 -P 98d67152849e062c6de45b0e526daffc3d6cb29d563d40664a8d7140119a30b2 -R 39a4a0d8e5c6bc44cb1af4a996c13e18 -T +sym-major-release * -T +sym-release * -T +sym-version-3.35.0 * ++P 30f912d0b39ff6fcf9a555affb5990c4bce8726fbd27062cd0c95851724f91d4 acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b ++R da5b233d420dc6ba22196b791954b6f4 + U drh -Z 57dbd644ae30193b3f75279561c2eade ++Z b4aa7d1d2e4b55e0318e2e83d31c0dde diff --cc manifest.uuid index a87e80e8a5,6f063d70d6..4da1aed156 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 30f912d0b39ff6fcf9a555affb5990c4bce8726fbd27062cd0c95851724f91d4 -acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b ++03142e5f760ef46c7837fef1b21f54baf64f4b9d99d1c9e3f4d8d6c8d1ab875f