From: dan <dan@noemail.net>
Date: Mon, 3 Mar 2014 17:48:03 +0000 (+0000)
Subject: Merge latest trunk changes.
X-Git-Tag: version-3.8.4~34^2~2^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80b2f97234eea2f38e06c39f440912303b73197a;p=thirdparty%2Fsqlite.git

Merge latest trunk changes.

FossilOrigin-Name: 1d60356462f111ed147aa865dd17a13511db6ab7
---

80b2f97234eea2f38e06c39f440912303b73197a
diff --cc manifest
index 956052609f,4cca5ef21a..15339f6098
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sharmless\scompiler\swarning.
- D 2014-03-03T15:13:27.429
 -C Change\san\sOP_SCopy\sinto\san\sOP_Copy\sin\sa\scase\swhere\sthe\sdestination\smight\sbe\nused\safter\sthe\ssource\shas\schanged.
 -D 2014-03-03T17:36:39.940
++C Merge\slatest\strunk\schanges.
++D 2014-03-03T17:48:03.279
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1152,7 -1153,7 +1153,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P e00ed717fbe456010ec6c746490d7c3e9d94ec5a
- R 8e3a8f60ae350e66db9c9ecb1f09657d
 -P 559835e54e0715f2b4d207d056199a8268af739e
 -R 0f407d04c62b2be5f5455aa20c5e914d
--U drh
- Z 6dbc33a5cff12ba0585c075afb66f191
 -Z c144dcb8dd86ca2b393613351986e190
++P d7f6837e6997a4d5c0fd2d08b52887d691dd6f97 c0fa0c0e2de50d7eda19ab8862496b18eff93538
++R 9a9d986bbf5df1b40c16a7d9f71c4a7c
++U dan
++Z 5c6a6f0f42fa42f03fa0c54709a35c4c
diff --cc manifest.uuid
index 206d58eaa6,097e35067a..a61bcd33e6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d7f6837e6997a4d5c0fd2d08b52887d691dd6f97
 -c0fa0c0e2de50d7eda19ab8862496b18eff93538
++1d60356462f111ed147aa865dd17a13511db6ab7