From: dan <dan@noemail.net>
Date: Tue, 1 Oct 2013 20:10:26 +0000 (+0000)
Subject: Merge trunk changes with this branch.
X-Git-Tag: version-3.8.1~45^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1073e26435cd5ef55cfb04e839725a79e9805712;p=thirdparty%2Fsqlite.git

Merge trunk changes with this branch.

FossilOrigin-Name: 65d9c6fafbc19d3582e07c31fd915a70e7fcfa8e
---

1073e26435cd5ef55cfb04e839725a79e9805712
diff --cc manifest
index 45d1e9dca0,56e25c88c9..1a062affcc
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Allow\smulti-token\sphrases\sto\sload\sdoclists\sfrom\sthe\sdatabase\sincrementally.\sThis\sallows\squeries\sthat\sfeature\ssuch\sphrases\sto\sbenefit\sfrom\sthe\s"docid<?"\soptimization.
- D 2013-10-01T20:02:32.683
 -C Fix\scomments\sin\sthe\sfast_vacuum.c\sdemonstration\sprogram.
 -D 2013-10-01T19:36:15.392
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2013-10-01T20:10:26.229
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1118,7 -1118,7 +1119,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P e294a9c7c525d1da698259c2fef089579bfd1c0b
- R a99fa9f8f9b9179941beba7f84a38d11
 -P 2b60320d57a4638ebf97a2854527649c671d108e
 -R 4a43823b2504f04ed4e291198b91050a
 -U drh
 -Z 3db92aeadc570f4d1597ec242e901a49
++P ea543f081d93ed1bf66c21ce2108ec94e349f4c5 e0db7b38e1bc0edb1c3995cb23c46488aa6a0909
++R d2f3c7ddacead75bcfbaa37694b1ef7b
 +U dan
- Z 1790cd325eb740a839ef9b2fc7e8e452
++Z 780ab77ea4503f5f6e1ddf0b75c99905
diff --cc manifest.uuid
index b09cca50d6,f05230ea2d..2edf5be192
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ea543f081d93ed1bf66c21ce2108ec94e349f4c5
 -e0db7b38e1bc0edb1c3995cb23c46488aa6a0909
++65d9c6fafbc19d3582e07c31fd915a70e7fcfa8e