From: dan <dan@noemail.net>
Date: Wed, 2 Feb 2011 04:40:07 +0000 (+0000)
Subject: Merge fts4aux branch.
X-Git-Tag: version-3.7.6~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4185db9007ac424aa11e050a6c58160f5881a4fd;p=thirdparty%2Fsqlite.git

Merge fts4aux branch.

FossilOrigin-Name: c6d9f7d8c48e1ff405e1c1d98a166974fc829f58
---

4185db9007ac424aa11e050a6c58160f5881a4fd
diff --cc manifest
index 0411312b21,8c4ee455ff..1e2ce7408c
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C SQLite\sversion\s3.7.5\srelease\scandidate\s2
- D 2011-01-28T17:03:50.592
 -C Add\smissing\sfile\sfts3_aux.c.
 -D 2011-02-02T04:26:46.725
++C Merge\sfts4aux\sbranch.
++D 2011-02-02T04:40:07.295
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -901,14 -901,7 +901,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 682fe41efd3578e8c9abc7138b61f361c3adbe95
- R 7fccaf9f7c013ddef8926255f6aeb773
- U drh
- Z 4223173e58f25d45d236e232b9c90989
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFNQvb6oxKgR168RlERAtOTAJ9BaewewKXL3RGZUy5ycaHwjeEmJACeOPbw
- /JKqOugR+37RH7HnLCo9DBk=
- =kgPx
- -----END PGP SIGNATURE-----
 -P 9897da22c5b51611597350efbe8d5dcaf39d748b
++P ed759d5a9edb3bba5f48f243df47be29e3fe8cd7 0147d9739f318a02721d3ae0e7be339a19231f60
+ R 531c9b98b4934054a140000876bf40a8
+ U dan
 -Z 4420e6d7471052847a2c86252d61b29e
++Z d29ed65f9181e7ba0766a4c73453d1ce
diff --cc manifest.uuid
index bccc723cb9,a825b9d3cd..3695689d87
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ed759d5a9edb3bba5f48f243df47be29e3fe8cd7
 -0147d9739f318a02721d3ae0e7be339a19231f60
++c6d9f7d8c48e1ff405e1c1d98a166974fc829f58