From: dan <dan@noemail.net>
Date: Thu, 19 Nov 2009 18:30:14 +0000 (+0000)
Subject: Merge leaves [7cd178a72a] and [598727e6da].
X-Git-Tag: version-3.7.2~810
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf50c46e4cb60951f957ecfe5fdb6d57d6c74b3e;p=thirdparty%2Fsqlite.git

Merge leaves [7cd178a72a] and [598727e6da].

FossilOrigin-Name: 4115c0c286052e32cb81f77a644d530c1766206f
---

bf50c46e4cb60951f957ecfe5fdb6d57d6c74b3e
diff --cc manifest
index ea87877793,e6ef83b406..648a6feefe
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Fix\sa\sperformance\sregression\sintroduced\swhile\sreworking\sthe\sfts3\scode.
- D 2009-11-19T18:28:45
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_Affinity\ssuppression\slogic.
 -D 2009-11-19T15:44:54
++C Merge\sleaves\s[7cd178a72a]\sand\s[598727e6da].
++D 2009-11-19T18:30:14
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 7f6c6aa7feeeb5e26e01b344161d9aa1b5d64177
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -772,7 -775,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 551dbe30eab5855756e6356f6ba050f5d1791ef8
- R f7b891b4bcfc7c759749c61f9eb643c5
 -R 98fe94712ce9c4ce5fa5e8d58cfa92bf
 -U drh
 -Z 61a2e8b4c8dda3fa21ce648b9b7f7137
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFLBWf5oxKgR168RlERAqg4AJ47XOftrmGz8qV1h2XK2I/2UAR9lwCcDjeL
 -jLozHQcgaZloRi252xg/qY4=
 -=SPdi
 ------END PGP SIGNATURE-----
++P 7cd178a72ab99c94fdacffb19aad819ae600e57d 598727e6dae87f133c658fa125684f6ad978be60
++R fa3f77e1031f7ddfc32b18ebcb9c7d5a
 +U dan
- Z 8e0de62e656b56f2e53230487feca6ce
++Z 98edfed95630a7f71d24a5499ccf87bc
diff --cc manifest.uuid
index 91ca6d099e,9f940649a4..573dbc00c3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7cd178a72ab99c94fdacffb19aad819ae600e57d
 -598727e6dae87f133c658fa125684f6ad978be60
++4115c0c286052e32cb81f77a644d530c1766206f