From: drh <drh@noemail.net>
Date: Fri, 16 Jan 2015 12:44:52 +0000 (+0000)
Subject: Merge all 3.8.8 changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c2e9f7afa07a7763517f0332d3a81e3f9d01d73;p=thirdparty%2Fsqlite.git

Merge all 3.8.8 changes into the sessions branch.

FossilOrigin-Name: bebd131a3554ea95921e6edbc8aa36674ef25fe3
---

9c2e9f7afa07a7763517f0332d3a81e3f9d01d73
diff --cc manifest
index 9ea8d11b02,2d35ff8ff1..1ff89b747c
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\strunk\s3.8.8\sbeta\schanges\sinto\sthe\ssessions\sbranch
- D 2015-01-14T17:16:23.588
 -C Version\s3.8.8
 -D 2015-01-16T12:08:06.393
++C Merge\sall\s3.8.8\schanges\sinto\sthe\ssessions\sbranch.
++D 2015-01-16T12:44:52.039
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in d187860ec4d0ea7b9b7ac38b12681bf9784d9ed0
 -F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
++F Makefile.in 198c0ac8962bd72275f99dc0cb0a3089b2bed497
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 4c057774e6138b9023fc16ec05639ddd3329b152
 +F Makefile.msc 8f8be3042579d7c0140b3c5cf6b2cf81959ac5c1
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -26,7 -26,7 +26,7 @@@ F autoconf/missing d7c9981a81af13370d4e
  F autoconf/tea/Makefile.in d55bcc63832caf0309c2ff80358756116618cfca
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
- F autoconf/tea/configure.in 93d43c79e936fb16556e22498177d7e8571efa04
 -F autoconf/tea/configure.ac 93d43c79e936fb16556e22498177d7e8571efa04
++F autoconf/tea/configure.ac 93d43c79e936fb16556e22498177d7e8571efa04 w autoconf/tea/configure.in
  F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
  F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
  F autoconf/tea/pkgIndex.tcl.in 3ef61715cf1c7bdcff56947ffadb26bc991ca39d
@@@ -169,7 -152,7 +169,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk aa64e621e7e4b6a5db6186236d1c9c6522204cdd
 -F main.mk e392561ffe17fc4dad945eef852400d5bf2911a0
++F main.mk 1cdd98cfcf1e771b339efb0dced91480e15313f3
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -1254,7 -1236,10 +1254,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 5a2dec55bfadc328b430a5231a037b37831a5530 882181ff9dd75f32db266db6e476671021fc567b
- R e4745f2aa60be4c3617dfbe8a7fd6de6
 -P 8f45217cbafef2297cdcec3fd69f4371dfb83922
 -R 933466cd8ec4e35d692da3aefe1a6703
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.8 *
++P 0ba124540b5b2a9ceda0f4f4a46e6be54edad813 7d68a42face3ab14ed88407d4331872f5b243fdf
++R 0819766cc49a8e68b0078048450bbb01
  U drh
- Z d901122b20adc39db7da73d5e36efc01
 -Z bb546801ed90d1803572e32e58b772a4
++Z 6b9aa66fea16fe35a684677c7f0c81fc
diff --cc manifest.uuid
index f5113bc4a4,b043ddc196..6049488211
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0ba124540b5b2a9ceda0f4f4a46e6be54edad813
 -7d68a42face3ab14ed88407d4331872f5b243fdf
++bebd131a3554ea95921e6edbc8aa36674ef25fe3