From: mistachkin <mistachkin@noemail.net>
Date: Fri, 9 May 2014 20:54:07 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~42^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52c40a89bbaa53c098b70910255fc34d510e7fd8;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: f4fea7bb8a4b118bdceff400a6c49c6291c0d58e
---

52c40a89bbaa53c098b70910255fc34d510e7fd8
diff --cc manifest
index e7b886da5d,491f33f044..7f6738b740
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C When\scross-compiling\swith\sthe\sMSVC\smakefile,\smake\ssure\sthe\scorrect\slibrary\spath\sis\sused.\s\sAlso,\skeep\strack\sof\sthe\srequired\scompilation\soptions\sseparately.
 -D 2014-05-09T20:51:17.136
 +C Merge\supdates\sfrom\strunk.
- D 2014-05-06T21:37:52.426
++D 2014-05-09T20:54:07.623
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1168,7 -1170,7 +1170,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P 7579c44ac1865133c37b16f2acc074d1eed4fdfd 99d96765cc378fde7b285f4577ea2b5d130d9a61
- R b392192acbeb452efb75eebb9d223240
 -P 116bed5af664899a73b46dca528ac0c021fc50c3
 -R 88c72e40fa185e1eb8f17237cccbb934
++P 69698ae90c415cb32d2c144725853483da65f0ff c3dce2e7390eec3a337be1b99f80ad5f721cc647
++R 5a8ec6fb329eaf82ce72337357145445
  U mistachkin
- Z f802d6476e6e3da761b28f52bb275366
 -Z b5868dcc5cdf0f5ef12e0a431c431ca8
++Z 30139e1f65fbd864d0f9d58c85a7550e
diff --cc manifest.uuid
index b18c38c41b,a49c4f2f02..8c9091248c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 69698ae90c415cb32d2c144725853483da65f0ff
 -c3dce2e7390eec3a337be1b99f80ad5f721cc647
++f4fea7bb8a4b118bdceff400a6c49c6291c0d58e