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

Merge updates from trunk.

FossilOrigin-Name: 668ed76ac6cfd5810aea7319c752d77fafaab319
---

75cc2f7a144240639b520d21a4143f84457d5efa
diff --cc manifest
index a5b1f99e5d,089fba14e7..44f50d85ea
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C When\sbuilding\sfor\sWindows\s8.0\susing\sVisual\sStudio\s2013,\smake\ssure\sthe\scross-compilation\snative\slibrary\spath\sis\sset\scorrectly.
 -D 2014-05-05T22:43:17.621
 +C Merge\supdates\sfrom\strunk.
- D 2014-05-05T20:35:44.698
++D 2014-05-05T22:50:19.792
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1167,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 9a06773acc181e981f61f476a8e56417b98beba9
 -R e91b1cf1dddb5793408fd6de2be74034
 +F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P 6f07f20e41446212a86989a5e6ce7f12998a3ae3 bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c
- R b637a8cdc330bea105f31b03071c445c
++P eaa8fc810fcff8171b6c5cff8c661a6faf0e023b c1ab9092e29bc9d172c1f1a3becbcc83b79f2080
++R 6e2bd0951e32bcb3346844cc25759e20
  U mistachkin
- Z 65ce3fa6eb7914f5f07ed0769c9e297a
 -Z b713eaa9517cf3b104e3dc82bdd65124
++Z 072e655b0f9d22e16552a74286be445f
diff --cc manifest.uuid
index dc41f1b41e,af81c8bc82..78722cf280
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- eaa8fc810fcff8171b6c5cff8c661a6faf0e023b
 -c1ab9092e29bc9d172c1f1a3becbcc83b79f2080
++668ed76ac6cfd5810aea7319c752d77fafaab319