From: dan <dan@noemail.net>
Date: Wed, 6 May 2015 18:15:28 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.8.11~270^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=828cdb3473fadfcd8b78251e747ab3b9df1eda4a;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 8a13e1fdbe523f2ace6cbb5bcb22cd4441f3cbf8
---

828cdb3473fadfcd8b78251e747ab3b9df1eda4a
diff --cc manifest
index 860da89670,6d6fcde033..a1bf1f35fb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\ssome\sdead\scode\sfrom\sfts3_snippet.c.
- D 2015-05-06T17:51:59.283
 -C Have\sthe\sautoconf\spackage\sbuild\sthe\sshell\stool\swith\sSQLite\slinked\sin\sstatically.
 -D 2015-05-06T14:18:58.864
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-05-06T18:15:28.184
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1256,7 -1256,7 +1256,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 8c5b9fedfcee3ac22a222819dceb981ad94a9903
- R 9c0ae1ced8b4f8180762181541a87277
 -P 04afa3febee32854fbb09ef8d4ffffd432119716
 -R c802443e961f136bbb49cf06ee4d41db
++P 46b2d3cef5c22a9e6bd0a4f8411f17b7ec72bd18 31834c3aa7deeafee1163a67caf5f3197f07baf4
++R 930b165f7186607d9f8c07a2f3ae8d3e
  U dan
- Z 598498d40245cf3b5c2dae507eb1e6dd
 -Z de033081a6dd5244aca249205579af45
++Z 1e3e34749eeae85df109f46fe0a4844e
diff --cc manifest.uuid
index 342085a825,7f767af7e0..1dd94cd21e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 46b2d3cef5c22a9e6bd0a4f8411f17b7ec72bd18
 -31834c3aa7deeafee1163a67caf5f3197f07baf4
++8a13e1fdbe523f2ace6cbb5bcb22cd4441f3cbf8