From: mistachkin <mistachkin@noemail.net>
Date: Sat, 21 Apr 2012 00:31:21 +0000 (+0000)
Subject: Merge the latest trunk changes into the WinRT branch (fixes for tickets [2a5629202f... 
X-Git-Tag: version-3.7.13~11^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=045f09cbb9d939c4ebd30388850bc2d4b2823029;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the WinRT branch (fixes for tickets [2a5629202f] and [385a5b56b9]).

FossilOrigin-Name: 25478dcff59690a5f59c3b96600374184057eae9
---

045f09cbb9d939c4ebd30388850bc2d4b2823029
diff --cc manifest
index 21b75586eb,164cba9eef..826b1f2988
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sWinRT\sbranch\s(fixes\svarious\sMSVC\scompiler\swarnings).
- D 2012-04-20T08:23:32.979
 -C Do\snot\sconsider\sa\sDISTINCT\sclause\sredundant\sunless\sa\ssubset\sof\sthe\sresult-set\sis\scollectively\ssubject\sto\sa\sUNIQUE\sconstraint\sand\sit\scan\sbe\sguaranteed\sthat\sall\scolumns\sof\sthe\ssubset\sare\sNOT\sNULL\s(either\sdue\sto\sNOT\sNULL\sconstraints\sWHERE\sclause\sterms).\sFix\sfor\s[385a5b56b9].
 -D 2012-04-20T16:59:24.885
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sWinRT\sbranch\s(fixes\sfor\stickets\s[2a5629202f]\sand\s[385a5b56b9]).
++D 2012-04-21T00:31:21.773
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1000,7 -994,7 +994,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P b2a2fdb0ac8d27efe3036fc49941279e24de6211 3281972eaa46cb57fd9f0387063f47430dc0a3b4
- R 78edc20e1e975f9e0d821b4521149c85
 -P 9870e4c4fef10112c987c40cb1b95255a7214202
 -R 7b0d4f32973f40703f4feb63496b017b
 -U dan
 -Z 293167d92a8f749c1bd20f8cdd573739
++P 294a5cca5087b510c2483792631bbf98a415e254 7b8548b1872cc1225355ba8311e93dd08d6526e2
++R dd7224aee3a3a8ff8a26727b1243ba57
 +U mistachkin
- Z 4ead4f8ca648b9c6da92e503c403b730
++Z 89bcb246fbfedd2e196bdf30f9fdc4fa
diff --cc manifest.uuid
index 35549573dd,566056cbe1..df49ee4333
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 294a5cca5087b510c2483792631bbf98a415e254
 -7b8548b1872cc1225355ba8311e93dd08d6526e2
++25478dcff59690a5f59c3b96600374184057eae9