From: dan <dan@noemail.net>
Date: Mon, 11 Jan 2016 18:30:34 +0000 (+0000)
Subject: Merge trunk with this branch.
X-Git-Tag: version-3.11.0~157^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=166e7e970548a5c6cbcbf96067c4e84e20377b39;p=thirdparty%2Fsqlite.git

Merge trunk with this branch.

FossilOrigin-Name: a73d245f2e523a57163bc93d9fb6a74c4cdf21e7
---

166e7e970548a5c6cbcbf96067c4e84e20377b39
diff --cc manifest
index 6158acb724,e4dfdc13fc..5a749962b4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sfts5speed.tcl\sscript\sto\sext/fts5/tool/.
- D 2016-01-11T18:23:07.397
 -C Performance\soptimization\son\sthe\sColumn\sopcode.
 -D 2016-01-11T18:05:00.482
++C Merge\strunk\swith\sthis\sbranch.
++D 2016-01-11T18:30:34.152
  F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@@@ -1411,7 -1407,7 +1412,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 0e3c545423246231ddac8fed2f103d71d556e17f
- R af2ae430a57fbc5161db0dbbd31b8a3f
 -P 2f8bd5fab8cc51d1f8932c3490fd24dbccf6ef31
 -R 68508ce4367c0efdf38feafa98972c4a
 -U drh
 -Z e90441a49428aea3c83069305613bb8e
++P 2c0b93553ebb00a70c611eb8dac021877933f088 ecc98bef43c2fd07d64e4efddf340929a875ebac
++R fac95fe8d4249da246cad11b14ac9297
 +U dan
- Z 7e47e5a1c7084b8fa203746692b6702a
++Z 0acdab0d7c32bec7117a883df7ebebf7
diff --cc manifest.uuid
index 7a083e6ea4,bccf8bb6b0..0ab6f5ff10
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2c0b93553ebb00a70c611eb8dac021877933f088
 -ecc98bef43c2fd07d64e4efddf340929a875ebac
++a73d245f2e523a57163bc93d9fb6a74c4cdf21e7