From: stephan Date: Mon, 12 Aug 2024 13:31:43 +0000 (+0000) Subject: Merge current trunk into this branch. X-Git-Tag: version-3.47.0~88^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57a0af406e66af40b4f0d4235d25155f80046db2;p=thirdparty%2Fsqlite.git Merge current trunk into this branch. FossilOrigin-Name: 900a593ddf51eebddb70e2e9ab16abe4911f58f23e574e88ed340a919b8f16b6 --- 57a0af406e66af40b4f0d4235d25155f80046db2 diff --cc manifest index c392f70d94,159330c456..bb188142de --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Fix\sa\snon-bare-bones-mode\stest\scase\sbroken\sby\sthe\sprevious\scheckin. - D 2024-07-25T16:28:55.294 -C Resolve\sparameters\sBind\s$int_N\sand\s$test_T\sin\sfuzzcheck\sinputs. -D 2024-08-12T09:49:02.212 ++C Merge\scurrent\strunk\sinto\sthis\sbranch. ++D 2024-08-12T13:31:43.385 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -2197,8 -2204,8 +2202,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 ec02e9237e1ef81c4196fa630822cb109eab926143ad09593a24273eb0668601 - R 72c1b5abda53d89da6a43993db19cd53 -P d4014c87ba9b011a6a04c2bf85879b668dc762ebcbbfb50a2f8a417ce594ef88 -R 33ab7e360692d6ed2c1cd4d18565e8ac -U drh -Z 32b23835ef00f951c0107d2a77ff843c ++P 3be729493b76a8b51c19d81543dea2dcb1fc718f81d4f2d9c6e1381789217687 9c10664416274df6f8da53ddd86f6356c9704ad798fd4034d2784ae433c1c056 ++R fa116f7277db9cf2640434f35cc3643d +U stephan - Z 8d08c3414a4f5b6a65c45fd3dc3ee076 ++Z b30383c3277b6bf2d3ab4856db5f4a76 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 5054a64027,ef73d7fbbd..529a8f25af --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 3be729493b76a8b51c19d81543dea2dcb1fc718f81d4f2d9c6e1381789217687 -9c10664416274df6f8da53ddd86f6356c9704ad798fd4034d2784ae433c1c056 ++900a593ddf51eebddb70e2e9ab16abe4911f58f23e574e88ed340a919b8f16b6