From: dan <dan@noemail.net>
Date: Fri, 26 Jun 2015 20:25:59 +0000 (+0000)
Subject: Merge fts5 branch into trunk.
X-Git-Tag: version-3.8.11~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef4f75637c657b7d4909b9acfe5163d29237ecb6;p=thirdparty%2Fsqlite.git

Merge fts5 branch into trunk.

FossilOrigin-Name: d27d9965b5404cd32be1113215fd9feeb5b66acc
---

ef4f75637c657b7d4909b9acfe5163d29237ecb6
diff --cc manifest
index 9662ec543a,a8a2255685..b736989fb2
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Small\ssize\sreduction\sand\sperformance\sincrease\son\sthe\sOP_IdxInsert\sopcode.
- D 2015-06-26T19:43:55.327
 -C Merge\slatest\strunk\swith\sthis\sbranch.
 -D 2015-06-26T20:14:23.171
++C Merge\sfts5\sbranch\sinto\strunk.
++D 2015-06-26T20:25:59.799
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
+ F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
+ F Makefile.msc de7668a4f537f91bdb185e7194a798b1d59f101f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -1286,7 -1364,7 +1364,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 eaddbf296aee98ffca82adade1b0d2fbefd09d7b
- R e2390f27840a2165ad1c292ca6931905
- U drh
- Z 46d8302c1ebdc3ef48ddf35916e18889
 -P c1b268ced38259706674ed2fcbf842d3fbd9fb8c b6bedc2e9c2f87709673799db9401b95fdb386b0
++P b6bedc2e9c2f87709673799db9401b95fdb386b0 8671b9e137275d247e67e3d7d5d9c4cb1f380ff7
+ R 0da9483025b8e801a1ae1ccbcdc9a8a2
+ U dan
 -Z dcbee8465e533d0ab6cec1bca607aa0a
++Z d74fcb200391e22b2c75ffc9a8c44934
diff --cc manifest.uuid
index 568be4203b,912b59864e..52f47d959f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b6bedc2e9c2f87709673799db9401b95fdb386b0
 -8671b9e137275d247e67e3d7d5d9c4cb1f380ff7
++d27d9965b5404cd32be1113215fd9feeb5b66acc