From: dan <dan@noemail.net>
Date: Fri, 13 Mar 2020 07:28:08 +0000 (+0000)
Subject: Merge SQLITE_NOOP_UPDATE fix into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fff4502ad379b418fcf9136fa314660bb8da3e8;p=thirdparty%2Fsqlite.git

Merge SQLITE_NOOP_UPDATE fix into this branch.

FossilOrigin-Name: e2cc655e0d49ea8482f59aab910b6bec22873d0241beca70643783b6f641747f
---

6fff4502ad379b418fcf9136fa314660bb8da3e8
diff --cc manifest
index 1ef8554289,94860427ea..e251af89eb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\slink\sfrom\sbegin_concurrent_report.md\sback\sto\sbranch\stimeline.
- D 2020-03-12T19:37:16.326
 -C Fix\sa\stypo\scausing\sSQLITE_NOOP_UPDATE\sbuilds\sto\sfail.
 -D 2020-03-13T07:23:20.658
++C Merge\sSQLITE_NOOP_UPDATE\sfix\sinto\sthis\sbranch.
++D 2020-03-13T07:28:08.376
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1874,7 -1872,7 +1874,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 b288bbd1df227f9566792491945c603d3736f238ca8a6ac1803cc385e6c3b621
- R b442754ef0a8fd65db2e6a5c2cc85d8f
 -P 23bc80cc8681762e42376e5d878fe60ccc9a6533b7d017e54280996ea363c3f5
 -R 9dd87835a256722f5a841fd7efa657e0
++P 61869f8b483a6bafa8fe321a9e9417da5ff13043795b8b676281c5f8ac3bf3f5 1e2109fd339cfb3b906673479672ed2e5a0dc17a94210f364c6fc1a657a62ae8
++R 7cd6fdbf65830072902233525a4e76f0
  U dan
- Z 7ab2090decf363a9f3340fbdd4592689
 -Z ca69e79c36c59c0b831ec71263d78874
++Z 4f8b044739a3e45a32fef087543c77e9
diff --cc manifest.uuid
index 7b8bfe8d01,93329f1198..f3fa9975ca
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 61869f8b483a6bafa8fe321a9e9417da5ff13043795b8b676281c5f8ac3bf3f5
 -1e2109fd339cfb3b906673479672ed2e5a0dc17a94210f364c6fc1a657a62ae8
++e2cc655e0d49ea8482f59aab910b6bec22873d0241beca70643783b6f641747f