From: drh <drh@noemail.net>
Date: Fri, 16 Oct 2015 20:12:12 +0000 (+0000)
Subject: Merge the 3.9.1 changes into trunk.  (This only updates the version number
X-Git-Tag: version-3.10.0~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04ce31fafe5702ef5789eea595e3504542f6aabd;p=thirdparty%2Fsqlite.git

Merge the 3.9.1 changes into trunk.  (This only updates the version number
and configure script since all the other changes in 3.9.1 were cherrypicked
from trunk.)

FossilOrigin-Name: eb2317429fc3fc81ccd92e6f84f873585829259d
---

04ce31fafe5702ef5789eea595e3504542f6aabd
diff --cc manifest
index 3937fbbd7f,4136b6383d..12ac2dfae9
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,14 +1,11 @@@
- C Fix\sthe\sfuzzershell\sutility\sprogram\sso\sthat\sit\scompiles\swith\sthe\namalgamation\sthat\sincludes\sJSON1\ssupport.
- D 2015-10-16T15:42:50.298
 -C Version\s3.9.1
 -D 2015-10-16T17:31:12.550
 -F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 -F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
 -F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
++C Merge\sthe\s3.9.1\schanges\sinto\strunk.\s\s(This\sonly\supdates\sthe\sversion\snumber\nand\sconfigure\sscript\ssince\sall\sthe\sother\schanges\sin\s3.9.1\swere\scherrypicked\nfrom\strunk.)
++D 2015-10-16T20:12:12.471
 +F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
 +F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 +F Makefile.msc 8e42cb55739cd8c12e1fd25401956e2019448f6a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
+ F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 -F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
@@@ -35,8 -38,8 +35,8 @@@ F autoconf/tea/win/rules.vc c511f222b80
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 42b71ad3fe21c9e88fa59e8458ca1a6bc72eb0c0
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 99485c9c0446d1236a78a53de6f2737f45f0aca5 x
 -F configure 436b5d81c66f62d5069cdf306a74845fff9e6f9f x
 -F configure.ac 1e87304e51af110950c48a1eea6ffc7a577f600e
++F configure 762a66c6eb9331f8af21f5d00b610bd61eaf8e14 x
 +F configure.ac f36bd4fb8c53eed8374c5a5ef319807c08c23fa9
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@@ -1391,7 -1390,10 +1391,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P bc9a9a60c31ebf9b11ac89ae5f99a3b66d6efc67
- R 1fa840b60dfe445d09770ce98d6f21ab
 -P 746fcd2fd412ddc27071827fb20eb6df0741dfb1
 -R d66bf398f8de1fb81851cd37ab3877c3
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.9.1 *
++P d6fc616e4c8a024f71a044e61f0493dea7d9c812 767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
++R 18e9c8e6d6f6d791d021b8710d206185
  U drh
- Z 76f00c6fa0ab4e9a2fefb67e0046eccb
 -Z 1827cdee71f363c0f73376b432ed6e27
++Z ab2147dc71d13d5bd253718a8a6d171b
diff --cc manifest.uuid
index 362fe6564b,b00e53a180..a9dc7fd9de
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d6fc616e4c8a024f71a044e61f0493dea7d9c812
 -767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
++eb2317429fc3fc81ccd92e6f84f873585829259d