From: dan <dan@noemail.net>
Date: Mon, 27 Oct 2014 07:01:04 +0000 (+0000)
Subject: Merge trunk with this branch.
X-Git-Tag: version-3.8.8~221^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c65f84630b7b956d864f756a293c8a979dc57e02;p=thirdparty%2Fsqlite.git

Merge trunk with this branch.

FossilOrigin-Name: a13df3013bbac4a0d4fce5cef1376c857508c1c5
---

c65f84630b7b956d864f756a293c8a979dc57e02
diff --cc manifest
index 1a5be4bf57,6d8395af5e..bafcf0fb91
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\smodifications\sto\snew\scode\sto\sbetter\shandle\scorrupt\sdatabases.
- D 2014-10-25T20:36:28.557
 -C Increase\sthe\sresolution\sof\sthe\ssecond\sparameter\sto\sthe\slikelihood()\sSQL\nfunction\s(the\sprobability\svalue)\sso\sthat\sit\scan\shandle\sprobabilities\nas\ssmall\sas\s0.00000001.\s\sFormerly,\sit\sran\sout\sof\sprecision\sat\s0.001.
 -D 2014-10-25T13:42:16.126
++C Merge\strunk\swith\sthis\sbranch.
++D 2014-10-27T07:01:04.796
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1205,7 -1206,7 +1206,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 ecc3544e712041736af7c7b4f34864a1f2e30ff7
- R 17dc589efbb3f16f6448c9d9d1ae2e24
 -P b9ad601eab1d7298d369267eb697c7fa1bc16985
 -R 06fd31d9e4c300e561fccc4cf28a702b
 -U drh
 -Z 628a0c5751868817bd40f1740c611aef
++P 1a8cf0a043347772ac54d150d634c32845beee8b 0f08924fe0c52a85a103f67bee9809e0f8f884b0
++R 9858b90cbf912e211c65716d59c94e8a
 +U dan
- Z c615066e82cbd286f5597ce396069fd7
++Z daf2b363c619dfc32da3ad287a4e25ec
diff --cc manifest.uuid
index 23643921ec,3804da23b9..962b2e06bb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1a8cf0a043347772ac54d150d634c32845beee8b
 -0f08924fe0c52a85a103f67bee9809e0f8f884b0
++a13df3013bbac4a0d4fce5cef1376c857508c1c5