From: stephan Date: Thu, 17 Oct 2024 22:20:27 +0000 (+0000) Subject: Merge current trunk into the autosetup branch. X-Git-Tag: major-relase~351^2~79 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1068f8b73d83db25201e4c87eaf7bf3a92a6d1b;p=thirdparty%2Fsqlite.git Merge current trunk into the autosetup branch. FossilOrigin-Name: 352da23b46f13fbb2c38fcdd0b6092bf39a391a0bfed587004c85f7f5b99a58d --- d1068f8b73d83db25201e4c87eaf7bf3a92a6d1b diff --cc manifest index 6550686c37,e88c2cb981..1933defda9 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C General\scleanups.\sRename\sBTCL\sto\sBTCLSH\sfor\ssome\sclarity. - D 2024-10-17T22:19:37.426 -C Ensure\sthat\sthe\sOPFS\sVFS's\sxOpen()\swrites\sback\sthe\sread-only\sflag\sto\sthe\soutput\sflags.\sResolves\sthe\sproblem\sreported\sin\s[forum:cf37d5ff1182c31081\s|\sforum\spost\scf37d5ff1182c31081]. -D 2024-10-17T12:14:34.534 ++C Merge\scurrent\strunk\sinto\sthe\sautosetup\sbranch. ++D 2024-10-17T22:20:27.470 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -2238,8 -2217,8 +2238,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 9a7e56a01703fdcb4c83481d33d48bd4c8e6a5586c1315bae36fdff34a1b3bd1 - R 30374e42cf396edeeab8be3ba90d92cf -P b7f7a5deeae61920dbfec7606cf9014de711f959a285b29e12673abfd2f88646 -R 556651a7ceaf11a031d680d31500bcba ++P 83eaef7d62677a85a2c42f98d52ff2e8e5356724ad6d12b2907409d96d4757f1 0a32624015f16fd881a4ecbb56b7833391028d327a95f4c899eee864ed7fe00d ++R 5bf6ee4a5edead94a59479d61cb4229f U stephan - Z 533ef536662a14cac9318bc23f02aeac -Z c682d4ab99e571cd5091abebe964c27a ++Z 0e34f05747acefc37ecfc30a7ac64e71 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 188d01b8e5,8b47ea3fc2..247ccbec00 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 83eaef7d62677a85a2c42f98d52ff2e8e5356724ad6d12b2907409d96d4757f1 -0a32624015f16fd881a4ecbb56b7833391028d327a95f4c899eee864ed7fe00d ++352da23b46f13fbb2c38fcdd0b6092bf39a391a0bfed587004c85f7f5b99a58d