From: drh <drh@noemail.net>
Date: Tue, 17 May 2016 17:11:21 +0000 (+0000)
Subject: Merge the latest changes from trunk.
X-Git-Tag: version-3.14.0~165^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8884d999262e9cb42bc42a58ac3e0d6507cf1601;p=thirdparty%2Fsqlite.git

Merge the latest changes from trunk.

FossilOrigin-Name: 5021dfe1f3f723a5938d547a0308f1d63103702d
---

8884d999262e9cb42bc42a58ac3e0d6507cf1601
diff --cc manifest
index 0f9b581c85,c05146f793..9b5c6f0b2e
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Additional\serror\sreporting.\s\sOpen\sthe\ssource\sdatabase\sread/write\sso\sthat\nit\scan\sdelete\sthe\sWAL\sfile\swhen\sdone.
- D 2016-05-05T23:59:22.078
 -C Do\snot\srun\ssnapshot_fault.test\sas\spart\sof\sthe\sinmemory_journal\spermutation.
 -D 2016-05-16T14:35:15.401
 -F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
++C Merge\sthe\slatest\schanges\sfrom\strunk.
++D 2016-05-17T17:11:21.184
 +F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
 +F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -303,7 -302,7 +303,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 0fb2b051c9dbcf7f26a8455cf115ae9457448b93
 -F main.mk 86e6a8d79186ace5ff8b306093da1728d953f796
++F main.mk eab7db27ac2a32b1172a85aa850c0b9c3a00524c
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -1488,7 -1488,7 +1489,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 b0bd9dd6255be161ea289ba6caa3fbd568128f62
- R dbc8e27f8b8809d87c6c9be80d710e34
 -P 386bcbba8ed733ee84958e6bd6e9d33c150e6c18
 -R 0e39e66ffd1d7cd6d62e8fa571ff36a1
 -U dan
 -Z 786140f96f9b408e2c11236687959ca4
++P d2efd3c176f0eba2d78105f0bb3161db38bd4bab 995c084bde44e678facc5f5d95a2335ce61e57b0
++R c8a04e46ce574c9cb7d04e9b64f57621
 +U drh
- Z 950b8c8bc6ebdccefe511e872cba5384
++Z 19bb7af983a6a8b12079243584bed878
diff --cc manifest.uuid
index 46b409542f,c971be0382..ba749ac7fb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d2efd3c176f0eba2d78105f0bb3161db38bd4bab
 -995c084bde44e678facc5f5d95a2335ce61e57b0
++5021dfe1f3f723a5938d547a0308f1d63103702d