From: mistachkin <mistachkin@noemail.net>
Date: Wed, 24 Aug 2016 18:49:20 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.14.2~8^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a1d1e452e841b2a89b6604592a9ba9be81e7223;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 428fc38d95dd88b90655a97133d0ad1214c9f176
---

2a1d1e452e841b2a89b6604592a9ba9be81e7223
diff --cc manifest
index 4e1dbf38c0,7dc1924e05..31ab0fb601
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
 -C Sync\sup\sthe\sMSVC\sautoconf\smakefile.
 -D 2016-08-24T18:21:58.857
 +C Merge\supdates\sfrom\strunk.
- D 2016-07-29T01:47:18.951
- F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
++D 2016-08-24T18:49:20.476
+ F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
 +F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
+ F VERSION 25e2e333adeff5965520bc8db999c658898c972d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -1449,8 -1452,8 +1452,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl aa58ea3be311c81821c2cd3209f55e46b07ab656
- F tool/mksqlite3c.tcl 655181fb25f69b3524b30efd0750c43513415216
 -F tool/mksqlite3c.tcl 63af8429841f08552e6da1d93b3dee4a93ff8071
 -F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
++F tool/mksqlite3c.tcl a52ead27e2ac5d4b616e945a0601f628f4328329
 +F tool/mksqlite3h.tcl cf5cd68028e69a51ed5c76042672664201f0f756
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1508,7 -1511,7 +1511,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 2daf20980d4cb9ed36372778ae1f3e595e503549 c7d51934a4f30d096bb79fc509fc9dd0df5d89a4
- R 092b06ead5aa5690fab5536515621278
 -P c640489db2037f1a284d7b85fa753ccdac1b8f79
 -R 959092fa640b62161f63260898254ab1
++P 71ffa195f5a48280ee522d80ab82e8cdea636961 77f7c31a3aa44798cfa5f557242caffb593ce7af
++R 6639d7ca813b34dc442dce0c70a8d49a
  U mistachkin
- Z 23d60fc77b6ae6b4289b40af8949150e
 -Z d96a1e74a14d6dd8b06850bfa4844a5e
++Z fc90dd7d8c306741e4a70346c0bad323
diff --cc manifest.uuid
index ee46095cc0,630410a19c..bce9ac3fde
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 71ffa195f5a48280ee522d80ab82e8cdea636961
 -77f7c31a3aa44798cfa5f557242caffb593ce7af
++428fc38d95dd88b90655a97133d0ad1214c9f176