From: drh <drh@noemail.net>
Date: Mon, 20 May 2013 15:14:42 +0000 (+0000)
Subject: Merge in all trunk changes up through the 3.7.17 release.
X-Git-Tag: version-3.8.0~130^2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81ec8c910b337ef2851083682c6b4b1153b9570c;p=thirdparty%2Fsqlite.git

Merge in all trunk changes up through the 3.7.17 release.

FossilOrigin-Name: 14ab6675e5eab3761256a06dad23d2b11220788a
---

81ec8c910b337ef2851083682c6b4b1153b9570c
diff --cc manifest
index 316d75d659,5b3b90661c..325be9d757
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C First\sattempt\sto\sget\sORDER\sBY\soptimization\sworking\sin\sNGQP.
- D 2013-05-14T15:31:07.121
 -C Version\s3.7.17
 -D 2013-05-20T00:56:22.515
++C Merge\sin\sall\strunk\schanges\sup\sthrough\sthe\s3.7.17\srelease.
++D 2013-05-20T15:14:42.009
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
+ F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 8f4ee0dab220a5276d5da61149dfd6cd5d1dd5b8
+ F Makefile.msc 5dc042f51187414d5886ac6d8308630d484690c4
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@@ -1062,7 -1065,10 +1065,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P d6946f33c7851aa7efb04b93ac2ae1ac50c26eec
- R fe984d1689a56a08a31662e67855ab37
 -P 7a9aa21c3506a10ab9465540e81071b39bca447d
 -R c103e20e6479251bb5b95c9b2e375810
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.17 *
++P 9fe20292558bb9422de91e35648cb834cbf3b306 118a3b35693b134d56ebd780123b7fd6f1497668
++R b3fec2668cd66935dfd81d00e243b60d
  U drh
- Z 13c634b8e2044390ac483fb2d5137194
 -Z 416a23d38a1b2c089b32c7a6efcbc3bc
++Z e02385c0316003dbdd17c2ecf0ba1968
diff --cc manifest.uuid
index 7326bbb499,8bfbf98bd7..52fb631158
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9fe20292558bb9422de91e35648cb834cbf3b306
 -118a3b35693b134d56ebd780123b7fd6f1497668
++14ab6675e5eab3761256a06dad23d2b11220788a