From: dan <dan@noemail.net>
Date: Tue, 28 Jun 2011 14:16:42 +0000 (+0000)
Subject: Merge the fts3-changes branch back into the trunk.
X-Git-Tag: version-3.7.8~38^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2504bbb227bda3d4ea601aaafe0995bb65624ed;p=thirdparty%2Fsqlite.git

Merge the fts3-changes branch back into the trunk.

FossilOrigin-Name: b9477eb056d120826ed82b0d65e6f27b5d0c087a
---

b2504bbb227bda3d4ea601aaafe0995bb65624ed
diff --cc manifest
index 52cfcaf6e7,f8bc9380fb..2109443aae
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Changes\sto\sallow\sFTS\sto\sbe\scompiled\sas\sa\sloadable\smodule\sagain.
- D 2011-06-28T07:15:43.990
 -C Add\sa\sfix\sand\stests\sfor\sthe\sFTS\sdeferred\stoken\slogic.
 -D 2011-06-28T11:58:09.194
++C Merge\sthe\sfts3-changes\sbranch\sback\sinto\sthe\strunk.
++D 2011-06-28T14:16:42.198
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -949,7 -949,7 +949,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 6c871ac1fa3c79baa0053dc49ab106cb3db4cfa0
- R 4e5d4c059d7e31bcf35d2d245a2997b7
 -P 226686475c28cdc87e86d2d3f10014436a9a2b8f
++P 29e69f389cb0078e125ba5814a68b3fe8cf634c6 91daea7d2ec41f014fb30c6371aae447cc07f287
+ R 26c661c69e309ad434e75bfd241a096d
  U dan
- Z c2844ce2a2f8548d3356adfa633cbd5b
 -Z 1b1eba0343676ae88643e1d9f2f985a9
++Z 7f90c6a2312621252bb79173b43d611c
diff --cc manifest.uuid
index b82e4229ca,0e9f22faf1..cfd8608c10
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29e69f389cb0078e125ba5814a68b3fe8cf634c6
 -91daea7d2ec41f014fb30c6371aae447cc07f287
++b9477eb056d120826ed82b0d65e6f27b5d0c087a