From: dan <dan@noemail.net>
Date: Thu, 16 Apr 2020 15:56:03 +0000 (+0000)
Subject: Merge accidentally created fork.
X-Git-Tag: version-3.32.0~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=054a0815554438116da171a18e4dfd8e50104543;p=thirdparty%2Fsqlite.git

Merge accidentally created fork.

FossilOrigin-Name: cb772b7a8fb53694cb267e74c11f49d2b9fd6920821c4e232f90ec35739c8904
---

054a0815554438116da171a18e4dfd8e50104543
diff --cc manifest
index 4f7d83de2d,03e7a37f31..32654b3149
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Clarification\sof\sthe\sbyte-order\sdetermination\sfor\sUTF16\sinputs\sto\sroutines\nlike\ssqlite3_bind_text16()\sand\ssqlite3_result_text16()\sand\sothers\sthat\naccept\sUTF16\sinput\sstrings.
- D 2020-04-15T17:39:39.862
 -C Improve\scorruption\sdetection\sin\sfts3\sshadow\stables\searlier\sin\sorder\sto\sprevent\san\sassert()\sfrom\sfailing.
 -D 2020-04-16T11:35:27.558
++C Merge\saccidentally\screated\sfork.
++D 2020-04-16T15:56:03.261
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1861,7 -1860,7 +1861,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 2b8c6b035a276029850de02651712a5fd69f4dfee45083d24b9d1f998004829b
- R 7af907123cde70d72ab14d313300d9ef
- U drh
- Z e055c082ef6d50bf436bbdcfa90b28f7
 -P 85d3dc8c50d8dbb8eac1956e8976e861d3b671e03355ca9257060fa3dca51cc4
 -R 6df0bde47e9f675523e9d30a8887c1df
++P a42fdcf54bcbd72a301dad4a040346dc48e67cacab43479ec618f5c32108c55f a9ec8c8f80a59badabb0afdb4189f0fd2934f936530d4151de395b3a7e7c1f1f
++R f504f25559e67d24d7bac4ba4fbb1261
+ U dan
 -Z 4f76143b71cc5a7c4e3cc701b84eb415
++Z bb44f1eb19ef7e1708ecd20763bc065a
diff --cc manifest.uuid
index eebee4beb8,84d9dbc14d..587bd3fd29
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a42fdcf54bcbd72a301dad4a040346dc48e67cacab43479ec618f5c32108c55f
 -a9ec8c8f80a59badabb0afdb4189f0fd2934f936530d4151de395b3a7e7c1f1f
++cb772b7a8fb53694cb267e74c11f49d2b9fd6920821c4e232f90ec35739c8904