From: dan <dan@noemail.net>
Date: Thu, 19 Nov 2009 14:57:14 +0000 (+0000)
Subject: Merge with [4bd4330709].
X-Git-Tag: fts3-refactor
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91b71c1ab264cf16f83189de5cbd849b3c663d7b;p=thirdparty%2Fsqlite.git

Merge with [4bd4330709].

FossilOrigin-Name: 7a46d1ebe348ce9f1e8732617a8e280f152fe979
---

91b71c1ab264cf16f83189de5cbd849b3c663d7b
diff --cc manifest
index 4837c6182c,1a4501e33f..643329eeaf
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Merge\sthe\sfts3-refactor\sbranch\swith\sthe\strunk.
- D 2009-11-19T02:52:58
 ------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 Merge\swith\s[4bd4330709].
++D 2009-11-19T14:57:14
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -772,7 -771,14 +772,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P fa0998e19d984ee57f4f506c34eb858026cc49c3 85940468e6f93f7c493fbc129f13cf6233c5d0c0
- R 985cc2377284c202d1c7ecad2a54b0e2
 -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 c8d2bd37a4c16154912a0831690584011dc230cb 4bd43307090258f8652c995b056101c51b81274a
++R c6e29b4f41f6c75cf1ecaf9ff4360465
 +U dan
- Z 600804b7b33f5407e58df712974da46a
++Z a2826435df5c371f1372a7d0448a17a3
diff --cc manifest.uuid
index 36921c414f,84754abfe3..92c0a197f2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c8d2bd37a4c16154912a0831690584011dc230cb
 -4bd43307090258f8652c995b056101c51b81274a
++7a46d1ebe348ce9f1e8732617a8e280f152fe979