From: mistachkin <mistachkin@noemail.net>
Date: Wed, 6 Jan 2016 20:50:02 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.13.0~133^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e787cbbe2ae697d6fc9e580404c1b325668bbe7d;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 5cbab63756f6f276996f39d16d70b178581f63cd
---

e787cbbe2ae697d6fc9e580404c1b325668bbe7d
diff --cc manifest
index 6efc1e7e97,d238fa51c2..6f70025bc8
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Alternative\sto\s[76f5efa6],\smove\sdefinition\sof\sutf8_printf\sup.
- D 2016-01-03T18:59:28.715
- F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 -C Disable\sthe\s--limit-mem\soption\son\sfuzzcheck\sunless\sthe\sSQLITE_ENABLE_MEMSYS5\sor\nSQLITE_ENABLE_MEMSYS3\scompile-time\soptions\sare\sused.
 -D 2016-01-06T15:54:53.139
++C Merge\supdates\sfrom\strunk.
++D 2016-01-06T20:50:02.942
+ F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
+ F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1406,10 -1406,7 +1406,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 e30062e9f6cae980150dda7df440b36dfdcb7bbe
- R ebd31578448110e2087f3d6a13f40257
- T *branch * altShellFix
- T *sym-altShellFix *
- T -sym-trunk *
 -P fd0a50f0797d154fefff724624f00548b5320566
 -R 87a59d21671d8eb854da54e44c1cb06d
 -U drh
 -Z 6b66decd394482c2ac340e90e8473c2f
++P 54c5522dda239cb9775709495ed7eb56a5dd8e11 55a11fd627eaf046b3783622b2925399a50a65b4
++R 46885463c2d1961463db4e0c7cb78c41
 +U mistachkin
- Z f75cb2b820513d79cf30ddfb170e4e99
++Z ce7926bdc7f3770ecae13f71c2dc0750
diff --cc manifest.uuid
index 2bb8fd855c,6cc9954870..3248019278
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 54c5522dda239cb9775709495ed7eb56a5dd8e11
 -55a11fd627eaf046b3783622b2925399a50a65b4
++5cbab63756f6f276996f39d16d70b178581f63cd