From: mistachkin <mistachkin@noemail.net>
Date: Mon, 5 May 2014 20:35:44 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~42^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2347e3b1bb9e8379fc9a9030f4919976b757b685;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: eaa8fc810fcff8171b6c5cff8c661a6faf0e023b
---

2347e3b1bb9e8379fc9a9030f4919976b757b685
diff --cc manifest
index 951c3069c1,f693fb7396..a5b1f99e5d
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
 -C Create\snew\sheader\sfile\s"os_setup.h"\sused\sto\sdetect\sthe\soperating\ssystem\nat\scompile-time,\sand\s"os_win.h"\sthat\scontains\swindows-specific\sheader\sin\nformation.
 -D 2014-05-05T20:32:15.817
 +C Merge\supdates\sfrom\strunk.
- D 2014-05-05T17:49:16.260
++D 2014-05-05T20:35:44.698
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
+ F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
- F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
+ F Makefile.msc cf9737350840c56f1e46204aa310227b8183c221
+ F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1134,11 -1136,11 +1136,11 @@@ F tool/mkkeywordhash.c c9e05e4a7bcab8fa
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
- F tool/mksqlite3c.tcl ed5b4e9ca8bf209ff401059a16362f37710fd8b8
+ F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
+ F tool/mksqlite3c.tcl ba274df71f5e6534b0a913c7c48eabfcbd0934b6
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
- F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
+ F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
 -F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
 +F tool/mkvsix.tcl 0d439bb042d0f889210afa91674fe7bf07131d39
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1165,8 -1167,8 +1167,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 -F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
 -P b5a72dfd59fba6a9938ac1afdec06a2e6809fd2d 3ac75725a66730566105ad184a988a8f80f51055
 -R 8d3da72aab741dd9279195207e6c8bd7
 -U drh
 -Z 892b3ce35265d0d6387ad7a7c3c1d88b
 +F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P 3bf97c811a25babf760f256245c756ed6710f8ba 4760504396bcf44528eb8de9ed7aa5d9659c54b6
- R 7528c11f061c95d3eb643567861393ad
++P 6f07f20e41446212a86989a5e6ce7f12998a3ae3 bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c
++R b637a8cdc330bea105f31b03071c445c
 +U mistachkin
- Z 8a7d8ea3a97a1cbf05228bbd87de6ceb
++Z 65ce3fa6eb7914f5f07ed0769c9e297a
diff --cc manifest.uuid
index ab0f6fa589,feb33def06..dc41f1b41e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6f07f20e41446212a86989a5e6ce7f12998a3ae3
 -bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c
++eaa8fc810fcff8171b6c5cff8c661a6faf0e023b