From: dan <dan@noemail.net>
Date: Thu, 19 Nov 2009 15:26:54 +0000 (+0000)
Subject: Merge fts3-refactor into the main trunk.
X-Git-Tag: version-3.7.2~812
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4c54eed2e381e0f943eb0df541d215981910563;p=thirdparty%2Fsqlite.git

Merge fts3-refactor into the main trunk.

FossilOrigin-Name: 551dbe30eab5855756e6356f6ba050f5d1791ef8
---

c4c54eed2e381e0f943eb0df541d215981910563
diff --cc manifest
index 1a4501e33f,b5d5dd021e..869616e2f8
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,7 +1,7 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Fix\sa\sbug\sintroduced\swith\srecent\soptimizations:\s\sThe\sunary\sminus\soperator\nis\sTK_UMINUS,\snot\sTK_MINUS.
- D 2009-11-19T14:48:41
 -C Fix\ssome\sfts3\srelated\sissues\swith\sthe\sautoconf\sand\samalgamation\sbuild\ssystems.
 -D 2009-11-19T15:25:25
++C Merge\sfts3-refactor\sinto\sthe\smain\strunk.
++D 2009-11-19T15:26:54
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
- F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1
+ F Makefile.in 7f6c6aa7feeeb5e26e01b344161d9aa1b5d64177
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -771,14 -772,7 +772,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 85940468e6f93f7c493fbc129f13cf6233c5d0c0
- R 4334616ec3a04171089d5218674f276f
- U drh
- Z ca489ed3469db220b1d5fb3df060f216
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFLBVrPoxKgR168RlERAoRaAJ4gDEPk2Y2GXXrrk8IpB/mDzLoa0gCcDFTL
- vi9c1acPvgWIuqUQcwsFpn8=
- =yxuW
- -----END PGP SIGNATURE-----
 -P 7a46d1ebe348ce9f1e8732617a8e280f152fe979
++P 4bd43307090258f8652c995b056101c51b81274a 3b17924754343c0163464dabf01a9c46ffccef28
+ R 627d84d1c58a3ccfd8d073223703a50a
+ U dan
 -Z 1a410374b24b6acf121a498e7894d5a2
++Z 3f2064eaa4e1d7bebb28fcd8b8486169
diff --cc manifest.uuid
index 84754abfe3,829cffec4d..0dbd8e5c54
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4bd43307090258f8652c995b056101c51b81274a
 -3b17924754343c0163464dabf01a9c46ffccef28
++551dbe30eab5855756e6356f6ba050f5d1791ef8