From: drh <drh@noemail.net>
Date: Tue, 23 Feb 2016 01:41:35 +0000 (+0000)
Subject: Merge trunk enhancements.
X-Git-Tag: version-3.20.0~165^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6627fd6126795c48ab6dd708af124f502e4e1352;p=thirdparty%2Fsqlite.git

Merge trunk enhancements.

FossilOrigin-Name: fac4f4ecee21a460e527a0e2ffa24094b74e17dd
---

6627fd6126795c48ab6dd708af124f502e4e1352
diff --cc manifest
index 921d12eb63,d23e81374a..1fe94cf9b0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\ssupport\sfor\s(variable\slength)\sinteger\skeys\sin\sLSM1.
- D 2016-02-23T01:37:24.930
 -C Remove\scode\snot\sneeded\snow\sthat\ssynchronous=OFF\sdatabase\sfiles\sno\slonger\ntrigger\sthe\suse\sof\sa\smaster\sjournal.
 -D 2016-02-22T23:44:42.710
++C Merge\strunk\senhancements.
++D 2016-02-23T01:41:35.494
  F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
@@@ -1445,7 -1429,7 +1445,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P f9e5fb88a5a14b26e9ea6997f449d0913f27a494
- R cb91bcf5f852d7d369f68158e9ec3ba2
 -P 2a6003a937a210dfc279e393d3a0b49d1f3ac92e
 -R 3fce95d53a76531400313bc834bea507
++P 32f3daec0a8084b258b2513c8025bc4d95a5d757 aa9f4c622af191edbeb6a535942944f8c91f5c37
++R 03319de6b06f1ae4f2324c01efdb9598
  U drh
- Z 5c76f2e4fcca8d24f17a7236982c41a2
 -Z c128e62f644c513c2811d577cffaf98d
++Z 7e07aa1e426a3abb50d562fbcc7f53c0
diff --cc manifest.uuid
index 14f6123316,0aad55cf0b..0b6cb3e157
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 32f3daec0a8084b258b2513c8025bc4d95a5d757
 -aa9f4c622af191edbeb6a535942944f8c91f5c37
++fac4f4ecee21a460e527a0e2ffa24094b74e17dd