From: dan <dan@noemail.net>
Date: Thu, 15 May 2014 19:05:55 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.8.5~39^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df2c52f728e6429222191a6c891b5cb44c995bb2;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 5809986ffcc5d9cbab64760f8d7fbfbb6b626ee7
---

df2c52f728e6429222191a6c891b5cb44c995bb2
diff --cc manifest
index 8d7389d529,b51b7ce0c3..f27c4b1f83
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\swith\sthe\shandling\sof\sdelete\smarkers\sby\sautomerge\son\slarge\sdatabases.
- D 2014-05-15T18:36:39.233
 -C Improve\sa\scomment\sin\sthe\sMSVC\smakefile.\s\sNo\schanges\sto\scode.
 -D 2014-05-12T22:36:50.007
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2014-05-15T19:05:55.306
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1172,7 -1170,7 +1172,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 34f6b4b8e4cb8ea45fd518672dc96335d1ce06ab
- R e26158b3998e23a04d5e7968b1e6dfac
 -P 013738f3d531078fb47f9992c18a0d630e771a32
 -R 50044157f65da46177a12dafd4a6afe2
 -U mistachkin
 -Z 53f9d3afbf5bc14f8e3dfdbc370843ae
++P 2b09bd17eb85ea3c682e930d2aabc6441f2265e0 0901dccedaf5679691ba803ec76d113de170185d
++R bc36878656a1df406ce5faa15b3690cd
 +U dan
- Z 27219917e93f1cfe1a1e1c19124576cc
++Z 7b26c3764a28756f379665cd911542c0
diff --cc manifest.uuid
index 8f898f62ee,7af790eea2..414ca82c34
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2b09bd17eb85ea3c682e930d2aabc6441f2265e0
 -0901dccedaf5679691ba803ec76d113de170185d
++5809986ffcc5d9cbab64760f8d7fbfbb6b626ee7