From: dan <dan@noemail.net>
Date: Mon, 10 May 2010 18:10:17 +0000 (+0000)
Subject: Merge [96d6eaf4d2] and [40b0a6357b].
X-Git-Tag: version-3.7.2~391
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ddccd2aad91f668f1c82a1143ed9158183e461d;p=thirdparty%2Fsqlite.git

Merge [96d6eaf4d2] and [40b0a6357b].

FossilOrigin-Name: c67756c404669141fa06a1ce3f1efadefa277bc6
---

7ddccd2aad91f668f1c82a1143ed9158183e461d
diff --cc manifest
index 70f1de0b76,6404fca01f..2b7b4027a5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Modify\sthe\sformat\sof\sthe\swal-index\sto\suse\sa\shash\stable\sto\sindex\slog\sfile\ssegments.
- D 2010-05-10T14:46:09
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Fix\san\suninitialized\svariable\sin\sOSX\sproxy\slocking.
 -D 2010-05-10T17:29:29
++C Merge\s[96d6eaf4d2]\sand\s[40b0a6357b].
++D 2010-05-10T18:10:18
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -813,7 -816,14 +813,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P 6ecdc7ba2b5e79e8b5862fb49cf6c2b99a40659a
- R d05ea03295a9fb019dfbc21cf1e7b6fc
 -R 296fb986e11cf95b39b6950a58d4fefa
 -U drh
 -Z 1d3446aa2fde26de146001251a9f61c1
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFL6EJ7oxKgR168RlERAqHaAJ4v/6NURAmQGNkn7dnF83kfUHcQdgCfaHE7
 -456WC63S5McoXqylSXNLqvY=
 -=Mr4k
 ------END PGP SIGNATURE-----
++P 40b0a6357b160e04326ab176955a68a1cf3f8b7c 96d6eaf4d2be453191b36875811d9556ad0763ed
++R 37996b296fbd165c26242b3ad78ab5eb
 +U dan
- Z acd3bcc163b4a5bf1cebc63a218dff15
++Z 33e8496ccc7b964e8849eef5eb4645d8
diff --cc manifest.uuid
index 5de47f9cf5,4c5187d84a..1b7532601f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 40b0a6357b160e04326ab176955a68a1cf3f8b7c
 -96d6eaf4d2be453191b36875811d9556ad0763ed
++c67756c404669141fa06a1ce3f1efadefa277bc6