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

Merge latest trunk changes into this branch.

FossilOrigin-Name: 82e5a6e088c58815140ad36715ac11c96527cb25
---

1c1cea8baec472eb39ae92d92e2b9b1321334f9c
diff --cc manifest
index a1bf1f35fb,984c3ea4b5..347dabbec1
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2015-05-06T18:15:28.184
 -C Test\scases\sfor\ssqlite3_analyzer\sand\ssqldiff.\s\sFix\sa\sproblem\swith\s\nsqlite3_analyzer\srelated\sto\sthe\srenaming\sof\sthe\sinitialization\sroutine.
 -D 2015-05-11T17:46:14.438
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2015-05-11T18:46:42.330
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1
+ F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc c6241f7fa2912427410ef15429c8ab5601e19a71
+ F Makefile.msc c65882433fde5f35ff66e759938eaf2dde9f360d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
+ F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1256,7 -1258,7 +1258,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 46b2d3cef5c22a9e6bd0a4f8411f17b7ec72bd18 31834c3aa7deeafee1163a67caf5f3197f07baf4
- R 930b165f7186607d9f8c07a2f3ae8d3e
 -P f84fbe98994c602de6c0b242dcbad3ab77298425
 -R 07df1d707f9f5d9656bc9195b802cb19
 -U drh
 -Z cfe7ea3673b7464899013ab57623434c
++P 8a13e1fdbe523f2ace6cbb5bcb22cd4441f3cbf8 85a4a46c3bb9fd8124969c9e975086c795113b7e
++R 06f86286adc5e3b19d722d7fe542b28d
 +U dan
- Z 1e3e34749eeae85df109f46fe0a4844e
++Z 10fff7a0c76d69f1bd9ea7fa3aec1db3
diff --cc manifest.uuid
index 1dd94cd21e,37ee30395b..b5d5f95788
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8a13e1fdbe523f2ace6cbb5bcb22cd4441f3cbf8
 -85a4a46c3bb9fd8124969c9e975086c795113b7e
++82e5a6e088c58815140ad36715ac11c96527cb25