From: mistachkin <mistachkin@noemail.net>
Date: Mon, 5 Sep 2016 20:40:38 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.14.2~8^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c55c8dbf7f23b839407a7bc8a076e0e9f7db2074;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: ea635bf97edb35b95b34adcb63f726f3573b1c4d
---

c55c8dbf7f23b839407a7bc8a076e0e9f7db2074
diff --cc manifest
index e72fee2001,60518ebe7c..516b49f189
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Modularize\sall\suse\sof\sthe\scalling\sconvention\smacros\sbased\son\sthe\sUSE_STDCALL\snmake\smacro.
- D 2016-08-24T19:58:46.902
 -C Build\sthe\sgenerate_series(START,END,STEP)\stable-valued\sfunction\sinto\nfuzzershell,\sto\smake\sit\seasier\sto\sconstruct\scompact\stest\scases\sthat\scontain\nactual\sdata.
 -D 2016-09-03T16:23:42.901
++C Merge\supdates\sfrom\strunk.
++D 2016-09-05T20:40:38.608
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
 +F Makefile.msc 2a8f135e10f383a31f1106cf42edabf3a18a3d08
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 25e2e333adeff5965520bc8db999c658898c972d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1511,7 -1511,7 +1511,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 428fc38d95dd88b90655a97133d0ad1214c9f176
- R 8fcf2f6bc8929252e1f73eaeed6c2ff1
 -P 9bdf7ca1b317fe0ba7efea38fb395bf6130ac89a
 -R f234dfb8eb81560f8891406102139ec1
 -U drh
 -Z 8e05ee287619d9d44d13c4eb0cda4de7
++P e4a56197b08546601bd6a623f667b43f50d603be 672c21bcf09c5bfb67e061456a56be45409c4f34
++R 1646f6bcd29be808598c5eaef7cdbbd2
 +U mistachkin
- Z 8acb335e007f8a860d6f64c92d2219b8
++Z 0df7884935e73ff5e3ea057f23c7e834
diff --cc manifest.uuid
index 60aed0f8b1,900a733d95..57dde5220f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e4a56197b08546601bd6a623f667b43f50d603be
 -672c21bcf09c5bfb67e061456a56be45409c4f34
++ea635bf97edb35b95b34adcb63f726f3573b1c4d