From: dan <dan@noemail.net>
Date: Tue, 9 Nov 2010 17:49:39 +0000 (+0000)
Subject: Merge with latest trunk changes.
X-Git-Tag: version-3.7.4~59^2~7
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=22c6a595b1b99975a4f4d9b3953569e20891858e;p=thirdparty%2Fsqlite.git

Merge with latest trunk changes.

FossilOrigin-Name: 4b5c93bc7c43c80962ddae65c58037bf5977b94b
---

22c6a595b1b99975a4f4d9b3953569e20891858e
diff --cc manifest
index c6c2d39540,02f35da05d..5def04d7b8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\smissing\scomments\sand\sfix\sother\sissues\swith\sroutines\sused\sby\snew\sEQP\sfeatures.
- D 2010-11-09T17:35:20
 -C Changes\sto\sthe\smultiplex\sVFS\sto\soptionally\s(compiler\sdefine)\sallow\s\nthe\s"chunk\sextension"\sto\soverwrite\sthe\sright-most\schars\sof\sthe\sfilename\s\ninstead\sof\ssimply\sbeing\sappended.
 -D 2010-11-08T19:16:16
++C Merge\swith\slatest\strunk\schanges.
++D 2010-11-09T17:49:40
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -886,7 -885,7 +886,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 73c93f5a2a32ee8c5d07c9ba33b2641e72626627
- R 8f6e7c70fce424ee9ca0153ffe26200c
 -P 65fa1164f035d270db48db6474da888aacfba3bd
 -R b100d3e162d12518a1c689502bc517e4
 -U shaneh
 -Z 5f41c44eac49aaf452bba5b19211e7d7
++P 925f35c535396603e13bb12e9a361072e2c2c223 07da0a0beffda324d28fd2768c542ff69d4dbff2
++R 98f45325ff5bf8617f39993671305af2
 +U dan
- Z fb47697d5a40be4039059baaad8146eb
++Z 311ea247f8fb626376cb7304b92a0778
diff --cc manifest.uuid
index a93db8e13b,04db900ece..fa6ec77a36
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 925f35c535396603e13bb12e9a361072e2c2c223
 -07da0a0beffda324d28fd2768c542ff69d4dbff2
++4b5c93bc7c43c80962ddae65c58037bf5977b94b