From: drh <drh@noemail.net>
Date: Wed, 16 Oct 2013 14:32:47 +0000 (+0000)
Subject: Merge the latest trunk changes.
X-Git-Tag: version-3.13.0~148^2~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d82d4750a80e474a9be03a6c9abb7fde1dc44ce2;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes.

FossilOrigin-Name: 5806546822b717d712dc7cd9de88a86f5bf2f715
---

d82d4750a80e474a9be03a6c9abb7fde1dc44ce2
diff --cc manifest
index cb2f963abe,d8ab59f65e..96b69c3e47
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.\s\sThis\smerge\nshould\sfix\sthe\sbuild\sfor\sWinRT.
- D 2013-10-15T14:10:44.320
 -C Clear\sa\svalgrind\serror\sby\szeroing\sthe\sfirst\s4\sbytes\sof\sthe\stemp-space\sallocation\sused\sby\sthe\sb-tree\smodule.
 -D 2013-10-16T11:39:07.819
++C Merge\sthe\slatest\strunk\schanges.
++D 2013-10-16T14:32:47.098
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 +F Makefile.in 15f75d6d804c5552a05390d1982c1114b8ce6d2d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc ec5d662ed5a15ff819928c0495017af13910d7b6
 +F Makefile.msc 72a3e9091272201b337908e136de753ba38c8206
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
@@@ -1140,7 -1126,7 +1141,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 136445ba020c9475d3f5a7843d7d0add98477138 c9c1f8d6701b0a1bc939a7e35e565d4160dbf8d3
- R 848ed2600ebe9a1cfea2c2b375b8cc21
 -P 9905cea9d45c90f2241f56dc32a25501476983bc
 -R 683bd0f00a6a8704ba66c77ac430cbf6
 -U dan
 -Z ba433fbc935328061983e8daeb762108
++P e111e4edf9d7b2d4d6d6673a7576801839e9537d 8651aba1865a8f82d21d3345f33fbd239fd9a042
++R 1e2f9ded6c7cb8edf0540013bd7feba5
 +U drh
- Z b89bea4f98dc4e576150aa4c3d9abc52
++Z a8c852ebe46ee653cedb027cf82e79d9
diff --cc manifest.uuid
index b5ba298137,77620da5ff..b92b5c35de
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e111e4edf9d7b2d4d6d6673a7576801839e9537d
 -8651aba1865a8f82d21d3345f33fbd239fd9a042
++5806546822b717d712dc7cd9de88a86f5bf2f715