From: dan <dan@noemail.net>
Date: Fri, 4 Sep 2015 10:24:05 +0000 (+0000)
Subject: Merge latest trunk changes.
X-Git-Tag: version-3.9.0~153^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31c171c1544b03f67dd5ae037ccaec67e99429ff;p=thirdparty%2Fsqlite.git

Merge latest trunk changes.

FossilOrigin-Name: 443a5eb8e17fd4f0b83ecc5bba74848e2c8a968c
---

31c171c1544b03f67dd5ae037ccaec67e99429ff
diff --cc manifest
index 20d7c879fc,bfd4ab3109..5a54d4e76e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Rearrange\scode\sin\sfts5_expr.c\sso\sthat\ssynonym\ssupport\sdoes\snot\sslow\sdown\sthe\scommon\scase.
- D 2015-09-03T19:48:02.456
 -C Simplification\sof\sthe\sLRU\slist\shandling\sin\spcache1.
 -D 2015-09-04T04:31:56.886
++C Merge\slatest\strunk\schanges.
++D 2015-09-04T10:24:05.602
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1382,7 -1380,7 +1382,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 4b49fe996989fe42d2bb1c24e7193fef09c5fc50
- R 0fe79065145fa2e8621202f9c4e41627
 -P f00a9e1e998c4bd249a45444dc2d71a7e4903b8b
 -R 231caff1c142ba151d728fb853afd78c
 -U drh
 -Z ce45274979109dc4b492f06dc4bc7386
++P 801882817f1d895aef1426f9a7196bd140b807c3 05a3a2cd140587265b5427d23c93c5be1f39e199
++R 3837e1c9ccb54eb6541c962b4dbcd417
 +U dan
- Z fe72ec30c1ce282b0a02c9b8970f9360
++Z aebae4d2d3a4f6c06865bc72afffba3d
diff --cc manifest.uuid
index 005faca754,562662b19b..4859e21de9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 801882817f1d895aef1426f9a7196bd140b807c3
 -05a3a2cd140587265b5427d23c93c5be1f39e199
++443a5eb8e17fd4f0b83ecc5bba74848e2c8a968c