From: dan <dan@noemail.net>
Date: Fri, 21 Jun 2013 18:29:49 +0000 (+0000)
Subject: Merge the fts4-notindexed branch with the trunk.
X-Git-Tag: version-3.8.0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=352d2ac6c75fd4d3eb0d8056a5df4b95c6993998;p=thirdparty%2Fsqlite.git

Merge the fts4-notindexed branch with the trunk.

FossilOrigin-Name: 361084e1eb281e985568d19fe217263be92be31d
---

352d2ac6c75fd4d3eb0d8056a5df4b95c6993998
diff --cc manifest
index 4b1070228c,c009a5bf3d..f3a124c901
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Disable\sposix_fallocate()\sfor\sall\ssystems,\sall\sthe\stime,\sunless\sthe\nHAVE_POSIX_FALLOCATE\scompile-time\smacro\sis\ssupplied.
- D 2013-06-20T14:07:37.671
 -C Add\sa\sfew\smore\stests\sfor\sthe\sfts4\snotindexed\soption.
 -D 2013-06-21T18:18:23.327
++C Merge\sthe\sfts4-notindexed\sbranch\swith\sthe\strunk.
++D 2013-06-21T18:29:49.697
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1093,7 -1094,7 +1094,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 2b2ade92788be623af6f57e37d98994be2cec142
- R 4c8df645fee7190a620dee659859568b
- U drh
- Z 4cfe85260540c90b4ee0898bd7491d71
 -P 8ff2b8f5948ccddce70102e6d68d464c66e4f7ca
++P b674462243138fcee192ef05d434665e30c681c4 b53c0c41f97c7ddaeea61f0e6035d1c4747db3f7
+ R 78eae7e4eba9ee605ccaf88bbcc953f5
+ U dan
 -Z 1a5ea5678be579c71cc2f3fe2b3716ce
++Z d8def49936980c4606b68402ae38fa82
diff --cc manifest.uuid
index 225d72de72,375d0c4373..eb0a0c67b7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b674462243138fcee192ef05d434665e30c681c4
 -b53c0c41f97c7ddaeea61f0e6035d1c4747db3f7
++361084e1eb281e985568d19fe217263be92be31d