From: mistachkin <mistachkin@noemail.net>
Date: Sat, 12 Sep 2015 16:59:38 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa985b3208aaf3679461cdc23aab5cf26f8c94df;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 4859778900a99e7e50ce3d56910ad4c5469f2cdb
---

aa985b3208aaf3679461cdc23aab5cf26f8c94df
diff --cc manifest
index 8a88988ee0,2f7902f582..d97e2d27b9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\scomments.
- D 2015-09-12T04:22:01.762
 -C Update\sevidence\smarks\sdue\sto\swording\schanges\sin\srequirements\stext.\s\sNo\nchanges\sto\scode.
 -D 2015-09-11T20:54:44.879
++C Merge\supdates\sfrom\strunk.
++D 2015-09-12T16:59:38.586
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1386,7 -1386,7 +1386,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 1a97bc81ccfc88f2dd527dff16e9e395718675bc
- R 7da2877070c61e4e7804a32fa3d7ad69
 -P bfc7b84b766860d2e410702ba7c1166d7328309a
 -R ed47f4fa6e24d2d49fdba867f1c9ec47
 -U drh
 -Z fe2e843011e778f2686c50d38eded399
++P de3fa51e931d34f341fc3432bfdf97390bb68d4e 86781093bdb4c4fdedd228cb1c8961db48a483bb
++R cfc16eded5405e1561a759b6078e93d0
 +U mistachkin
- Z 7f1031460ebf4d5a4e025d650694c0fb
++Z b4260572fc7350e5188ad004402214d3
diff --cc manifest.uuid
index d4e64e3ebb,2f4be5f0e9..213c339c2a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- de3fa51e931d34f341fc3432bfdf97390bb68d4e
 -86781093bdb4c4fdedd228cb1c8961db48a483bb
++4859778900a99e7e50ce3d56910ad4c5469f2cdb