From: dan <dan@noemail.net>
Date: Sat, 10 Nov 2018 17:36:55 +0000 (+0000)
Subject: Merge latest trunk changes.
X-Git-Tag: version-3.26.0~48^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fchangesetfuzz;p=thirdparty%2Fsqlite.git

Merge latest trunk changes.

FossilOrigin-Name: b6d549c988e765789c4a81d586170451db9f5da1973dde8aa0329445f915fbb2
---

ad5bafa699ffd5a6c7e489ed288009cab5bdd0d0
diff --cc manifest
index 6768ba3afc,749239362f..1a9ea49eb5
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Add\stests\sand\sa\sfix\sfor\sprogram\s"changesetfuzz".
- D 2018-11-08T14:59:51.259
 -C Fix\sinvalid\suse\sof\sunprotected\ssqlite3_value\sobjects\sin\sthe\ssqldiff\sutility,\nwhen\susing\sthe\s--changeset\soption.
 -D 2018-11-09T23:41:57.373
++C Merge\slatest\strunk\schanges.
++D 2018-11-10T17:36:55.425
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in edbb6e20bb1decf65f6c64c9e61004a69bdf8afb39cdce5337c916b03dfcd1e3
 +F Makefile.in d298b31769d4c737887102462cd45684786b09f2a626a80b3e413790fb436219
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5402eae167757dae275cd99c21d21d77db2ec1877c58b4f790ef747a60b95c9f
 +F Makefile.msc 071853dfc2148aadaeb7a153b9986cc9d71b7f256874f79b119f97a4c89453f5
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1778,7 -1776,7 +1778,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 53cd91d00594f1bd7c0a565a35ec9cac3095a583022d6211158a369e942257b0
- R 4f9b6e51162a868f3be4697b5f845cac
 -P ae9638e9c0ad0c366f93c88a850f6b4cc86881e9f3f9f1e39574d9d83ddd8a6a
 -R 17ad9438f43deccbfad222dc84835b58
 -U drh
 -Z 652d33c6a72178cf44c31358633e89a7
++P 09b90db56c2d5e3aceae59c6bf1eb07f9db9ef38da29d2162046b88d39e47b86 a8d65214a567eb1afd703ee4d09d398247e060a610b46097a726364db2861001
++R 3aab479e5526baa65c5716bd2f30b798
 +U dan
- Z 704726ba42c792e4e62ff5213c85060a
++Z abcba01d465aa5012c21006dab111180
diff --cc manifest.uuid
index f27348efa7,e1bfe3befc..f7f2d0d5c1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 09b90db56c2d5e3aceae59c6bf1eb07f9db9ef38da29d2162046b88d39e47b86
 -a8d65214a567eb1afd703ee4d09d398247e060a610b46097a726364db2861001
++b6d549c988e765789c4a81d586170451db9f5da1973dde8aa0329445f915fbb2