From: mistachkin <mistachkin@noemail.net>
Date: Thu, 6 Sep 2018 16:50:54 +0000 (+0000)
Subject: Merge accidental fork.
X-Git-Tag: version-3.25.0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1884487e4b59a9a60d220e3fc883f838b9d1966b;p=thirdparty%2Fsqlite.git

Merge accidental fork.

FossilOrigin-Name: ebadb7dc25b9ab544a941ceb9a18926268c21bb60de98737f6ef19915ee8e61a
---

1884487e4b59a9a60d220e3fc883f838b9d1966b
diff --cc manifest
index be10da1f42,d5034d8775..1adbc2f15d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sharmless\scompiler\swarning.
- D 2018-09-06T16:47:10.703
 -C Fix\sa\sproblem\scausing\sSQLITE_OMIT_VIRTUALTABLE\sbuilds\sto\sfail.
 -D 2018-09-06T16:47:08.186
++C Merge\saccidental\sfork.
++D 2018-09-06T16:50:54.629
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@@ -1764,7 -1764,7 +1764,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 00940265b18a3cf848602e1e0b3edbd935cb4309ef91a34b0d5746a258a47ae6
- R aa119265c5c6b82a2266e905a59ef2a3
 -R 04d4ebdc1406b73de53a4c2dd64c57bf
 -U dan
 -Z 70bd38bf8fb6c38808c5c6270275eca7
++P 88b39c46c15ab6bdd0ac9536ddb6fb09862d578d0f691c57d039b0a906f1c25c 18beabc848d0ed7f5c918cbec5372a49915d889d7ffc9f475e6b208407e9ebd2
++R 68068728e314ecb3ae42855f6cd530ec
++T +closed 18beabc848d0ed7f5c918cbec5372a49915d889d7ffc9f475e6b208407e9ebd2
 +U mistachkin
- Z 926cd23da25ae9109045ae0a7e6292ce
++Z e66ffcf424a62700e25e65c468585195
diff --cc manifest.uuid
index 6266b3ed47,bec9c42fc8..6818cc521b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 88b39c46c15ab6bdd0ac9536ddb6fb09862d578d0f691c57d039b0a906f1c25c
 -18beabc848d0ed7f5c918cbec5372a49915d889d7ffc9f475e6b208407e9ebd2
++ebadb7dc25b9ab544a941ceb9a18926268c21bb60de98737f6ef19915ee8e61a