From: dan <dan@noemail.net>
Date: Sat, 28 Jun 2014 14:25:32 +0000 (+0000)
Subject: Merge fixes from trunk with this branch.
X-Git-Tag: version-3.8.6~92^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4364dc5ea6697dfa37e61c2ec7d91469891854a6;p=thirdparty%2Fsqlite.git

Merge fixes from trunk with this branch.

FossilOrigin-Name: 6af219d1b83ec54b3fb4ad4e6216d9ad9ea0fc70
---

4364dc5ea6697dfa37e61c2ec7d91469891854a6
diff --cc manifest
index 14dfe69604,27807f1cbc..fc497fbfa9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scouple\sof\sproblems\sin\sestimating\sthe\snumber\sof\srows\svisited\sby\sa\srange\squery\sthat\suses\sa\sskip-scan.
- D 2014-06-27T20:14:25.215
 -C Add\ssome\smore\sIN\soperator\stests.
 -D 2014-06-26T22:17:21.764
++C Merge\sfixes\sfrom\strunk\swith\sthis\sbranch.
++D 2014-06-28T14:25:32.570
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1181,7 -1181,7 +1182,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 74a5454a710e1b7d8575cec2f872e6110aefce17
- R 02edb14d4ef805eea40e69e5acdf39b7
 -P 92f7ad43dbfe4e02490df2f932c3c74fb89064d6
 -R 61cea95999002249f7da20d93ec0602d
 -U mistachkin
 -Z 2021f223ccdab7be5b0b3bf69eadf881
++P 219736f54dcd1448af3400e699f1c20755ac6876 fb32e374b75b160e7b535e732ced6c34dbb513eb
++R 638c04374a356a745d9c2d2f0fa602ad
 +U dan
- Z bd7cb892a5b1d67344c0bf9079bc8afa
++Z fc19d5103e4b8e0f744c9b3dd9fc467e
diff --cc manifest.uuid
index d621593f3a,9daab53ded..bcfbef8325
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 219736f54dcd1448af3400e699f1c20755ac6876
 -fb32e374b75b160e7b535e732ced6c34dbb513eb
++6af219d1b83ec54b3fb4ad4e6216d9ad9ea0fc70