From: dan <dan@noemail.net>
Date: Sat, 9 Jun 2012 19:15:43 +0000 (+0000)
Subject: Merge latest trunk changes with sessions branch.
X-Git-Tag: version-3.13.0~148^2~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=618fea4830063e6a24fb4c71d7cd5c680ef7d0ab;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with sessions branch.

FossilOrigin-Name: 47f8f0711d63ef4166db9115db44b166959df14c
---

618fea4830063e6a24fb4c71d7cd5c680ef7d0ab
diff --cc manifest
index a6264f5fe2,8bced82de4..050ff5abc2
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\strunk\schanges,\sincluding\sthe\sWinRT\senhancements,\sinto\sthe\nsessions\sbranch.
- D 2012-06-07T23:58:36.424
 -C Add\smissing\stargets\sfor\sfts3_unicode.lo\sand\sfts3_unicode2.lo\sto\sMakefile.in.
 -D 2012-06-09T18:52:29.837
++C Merge\slatest\strunk\schanges\swith\ssessions\sbranch.
++D 2012-06-09T19:15:43.423
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
+ F Makefile.in d17fddaa4e81f93a7c9c7c0808aacb3fc95f79f4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
 +F Makefile.msc f4c1ecc6adf3e81857ccae612247db401df63e4c
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
@@@ -1018,7 -1005,7 +1018,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 7eff45c28058fd1cb06dfd7f253cf2e4866e8c7c cfcbf9375fddd0aae0dd17bdc76a710ab77ef667
- R dbfa0f0e08ebf8fec274eb616318eec9
- U drh
- Z efdc5269554081bca5634d27aa5c834f
 -P 025227be5495f950c466dfabac140cba69e498be
 -R 45dae5fdb66a9a88c8595b45bd7db627
++P c62140398344fd1a68a3e6dfe8b4fab280731ebb 0ae0ce630a2e11f81dca50a9cfb04c4a41c03b2d
++R 3d7646a2017b0e596385909c0de9563e
+ U dan
 -Z b0a689d65a4b2d791e77df9966396ebf
++Z 770dd5c1bc35db7eb59646895dc3fb87
diff --cc manifest.uuid
index 818ac5bca4,1a6654ac9a..9987079235
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c62140398344fd1a68a3e6dfe8b4fab280731ebb
 -0ae0ce630a2e11f81dca50a9cfb04c4a41c03b2d
++47f8f0711d63ef4166db9115db44b166959df14c