From: dan <dan@noemail.net>
Date: Tue, 1 Mar 2016 15:09:15 +0000 (+0000)
Subject: Merge branch-3.11-matchinfo into this branch.
X-Git-Tag: version-3.11.1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a93cd623cf6680869e596cafa58209f3b576400f;p=thirdparty%2Fsqlite.git

Merge branch-3.11-matchinfo into this branch.

FossilOrigin-Name: 42358170b35cc3e25c42f20e56f3f67e809001ba
---

a93cd623cf6680869e596cafa58209f3b576400f
diff --cc manifest
index 5d644993fb,329486cbd8..2ef2f4d6b6
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Further\srefinements\sto\sthe\sMSVC\sbatch\sbuild\sprocess.
- D 2016-02-26T21:01:37.745
 -C Fix\sa\sproblem\sin\sfts5\swhere\sa\scorrupt\sdb\scould\slead\sto\sa\s(huge)\sbuffer\soverread.\sCherrypick\sof\s[c9a30e117f].
 -D 2016-03-01T14:51:36.262
++C Merge\sbranch-3.11-matchinfo\sinto\sthis\sbranch.
++D 2016-03-01T15:09:15.371
  F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
 +F Makefile.msc 56ea123a975690bf9ed38b31bb89ff87b02a7c2b
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1427,7 -1427,8 +1427,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 480e5049486b8b047f533d78b040daa47dd6b946
- R 87ed83a4b8ba227fd93efdc4c65e0468
- U mistachkin
- Z ceeeca002bf9c099753e1f0c14c10004
 -P 5b1b7ab5d67f3d691e52ba57dbc14c52d90c6631
 -Q +c9a30e117f2c6c9ef0cc0c6ca5227d2961715b8f
 -R 9e1a768531e15f702b1609ee77fd97cc
++P 4e54e9c0fefe417f94a2d95921acf61b1dda5ca4 daef5869f4d62ebb24eb03b79fe4be0812fa0496
++R 941c7c2c1d8ea45171acb610a804d763
+ U dan
 -Z 25f98900ae0232bf213e8bdd46c5ac6f
++Z 0133e19e04cb90ccecc941fa59f3b459
diff --cc manifest.uuid
index a39c79627c,45cc164a6f..4e289c8410
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4e54e9c0fefe417f94a2d95921acf61b1dda5ca4
 -daef5869f4d62ebb24eb03b79fe4be0812fa0496
++42358170b35cc3e25c42f20e56f3f67e809001ba