From: dan <dan@noemail.net>
Date: Thu, 9 May 2019 11:21:32 +0000 (+0000)
Subject: Merge accidental fork in trunk.
X-Git-Tag: version-3.29.0~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb4a61a30cff88326069684788321dc5e01224fb;p=thirdparty%2Fsqlite.git

Merge accidental fork in trunk.

FossilOrigin-Name: ec9373031d76b34163a45d0ed05e43c0c9d585c8d47aa255f670340673bc7875
---

eb4a61a30cff88326069684788321dc5e01224fb
diff --cc manifest
index a1dabe9380,b835f636fb..b2fada1f60
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\sin\sthe\snew\scode\sintroduced\sby\s[658b84d7]\scausing\scorruption\sand\sother\serrors\sto\sbe\signored.
- D 2019-05-09T11:19:27.227
 -C Improved\serror\shandling\sfor\sthe\s".open\s--hexdb"\scommand\sof\sthe\sCLI.
 -D 2019-05-09T11:18:41.366
++C Merge\saccidental\sfork\sin\strunk.
++D 2019-05-09T11:21:32.067
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1825,7 -1825,7 +1825,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P ebe4845cd0ffb96b30be3c69eb399d58e93149886bc2fa60a7ebd7b4fbe447a4
- R e44f7e65f3b14237b84a8559c540124d
 -R 8e29ce757aa66674b46f1ad295c560b5
 -U drh
 -Z 58b67e014ab5b3e97fafa9cfec65dfaa
++P 7ccf2e7d413adb109c61456a5f46e87d38884801dbaab93297a17e3050014b59 4fa831d5cd5861f6a0a8f08a738b2d4d371fb2a788178ce86482c5bba761f9de
++R 1ba7996ce03dd9a1187260e95804fc29
++T +closed 4fa831d5cd5861f6a0a8f08a738b2d4d371fb2a788178ce86482c5bba761f9de
 +U dan
- Z 0f9cf99179363aae6d38e9c8478ef975
++Z e19c180b1a7fc00850ba36320f2fd4c8
diff --cc manifest.uuid
index 8f3c0024f8,adb46ef5c3..44520985b9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7ccf2e7d413adb109c61456a5f46e87d38884801dbaab93297a17e3050014b59
 -4fa831d5cd5861f6a0a8f08a738b2d4d371fb2a788178ce86482c5bba761f9de
++ec9373031d76b34163a45d0ed05e43c0c9d585c8d47aa255f670340673bc7875