From: dan <dan@noemail.net>
Date: Fri, 26 Nov 2010 10:58:48 +0000 (+0000)
Subject: Merge with latest trunk changes.
X-Git-Tag: version-3.7.4~36^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a93ca34129e6ea40ea5785739b8f72ef6e6eaeb7;p=thirdparty%2Fsqlite.git

Merge with latest trunk changes.

FossilOrigin-Name: 515cb3f4e5282551d300ba79c8885b8ca016a408
---

a93ca34129e6ea40ea5785739b8f72ef6e6eaeb7
diff --cc manifest
index f5a68af891,1f0ed38e49..0b97736a8c
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,10 +1,7 @@@
- C Add\scoverage\stests\s(and\sassociated\sfixes)\sfor\snew\smatchinfo()\scode.
- D 2010-11-25T17:49:28
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Fix\sa\scouple\sof\scompiler\swarnings\sin\stest_superlock.c.\s\sAdd\ssuperlock.c\nto\sthe\sMakefile.in\sused\sby\sthe\sconfigure\sscript.
 -D 2010-11-24T13:04:22
++C Merge\swith\slatest\strunk\schanges.
++D 2010-11-26T10:58:49
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
+ F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -889,7 -892,14 +889,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P ddc2b7ec2618b010c981ecfa05b3e53a9fac686f
- R e123b51122e9ccc0e657b3357d0441ec
 -P 1541ae3fbd7b3d471e002c0ad14e7846f7ad9415
 -R 23ed169dd1eaa7c16f1bbe2fbe57a18a
 -U drh
 -Z b29da3037485bdfcaa04aa9867a77538
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFM7Q1ZoxKgR168RlERAkTlAJ9pPhSfkPTLg/Rq/zg1H6kQDC/rjQCggZ30
 -DP3n4Bo1JUANTa9Pez3/EXc=
 -=OzBi
 ------END PGP SIGNATURE-----
++P 70495ceccc793d608930f59e330777f287ba1ede 461f1a010f55e7da6b43ea65550066b1ca7abad0
++R 3b6d9b4a663b0a1515af15682274f8ae
 +U dan
- Z 265f951641d795636aa4f45fe10ea271
++Z dc2d0a6a7b958d42d4d80a0f05fc0556
diff --cc manifest.uuid
index 57cb9a10b3,95dc69ba83..cf3ddc8972
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 70495ceccc793d608930f59e330777f287ba1ede
 -461f1a010f55e7da6b43ea65550066b1ca7abad0
++515cb3f4e5282551d300ba79c8885b8ca016a408