From: larrybr <larrybr@noemail.net>
Date: Fri, 5 Mar 2021 20:52:19 +0000 (+0000)
Subject: Merge last day of trunk changes, reverify build.
X-Git-Tag: version-3.35.0~32^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f8f131a8ba0e4ecb15fd39c3f24a3bca8732efa;p=thirdparty%2Fsqlite.git

Merge last day of trunk changes, reverify build.

FossilOrigin-Name: 1d67ed1c98a6bc49cce6bdc156bd6f22b3f37d33226bd62430a43aa5318f5781
---

1f8f131a8ba0e4ecb15fd39c3f24a3bca8732efa
diff --cc manifest
index 3a5ee2ff3d,e4ce5d3f8d..04d054db40
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sappendvfs\sbug\sexposed\sby\sdocsapp\sbuild\s(in\sdocsrc),\sand\stighten/revise\spublished\sbehavior.
- D 2021-03-05T20:46:53.770
 -C Modify\sthe\sSQLITE_DBCONFIG_ENABLE_VIEW\soption\sso\sthat\sit\salways\spermits\nTEMP\sviews,\sjust\sas\sSQLITE_DBCONFIG_ENABLE_TRIGGER\salways\spermits\sTEMP\ntriggers.
 -D 2021-03-05T18:33:01.185
++C Merge\slast\sday\sof\strunk\schanges,\sreverify\sbuild.
++D 2021-03-05T20:52:19.916
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1909,7 -1909,7 +1909,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 48c968bf4c8e1517864bec68d3072441994ea511a9cb446d2fdf031d5f43b077
- R d9b9b7ebcf10ff9c889756135ed9e77d
 -P 6b41b136fbfc0b56a6948f2306b69fb1d69306adb86674a15a87fe3b52062512
 -R 2b8fdfb64aa0287e9dad9e4deafc2264
 -U drh
 -Z 2672fe284ccfad8e2f3910b2a1b2092c
++P 7f0f2eacdb496f7f36865ba62164a48edb324a3c6baede736b4e7edf5e8b0fdb 83dab8b358b6832a221a58e74dd5e99b9cdea4eee65124bb6799881e867d989c
++R 261d589d0844d523eb8c45af3f152dcc
 +U larrybr
- Z c2502dcdc1270b481b2f881df0282e61
++Z fdae5c4e59947cb56e8a88d5f84b7f6e
diff --cc manifest.uuid
index 6b7bb0e60d,4153e89ec6..b866a55485
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7f0f2eacdb496f7f36865ba62164a48edb324a3c6baede736b4e7edf5e8b0fdb
 -83dab8b358b6832a221a58e74dd5e99b9cdea4eee65124bb6799881e867d989c
++1d67ed1c98a6bc49cce6bdc156bd6f22b3f37d33226bd62430a43aa5318f5781