From: mistachkin <mistachkin@noemail.net>
Date: Tue, 8 Jan 2013 17:24:25 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FconfigReadOnly;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: f29680c468d5635e5ea7711f12f56ff467824241
---

88bdfb7201f5227f8db9434ed37f79c299c36e1c
diff --cc manifest
index bf9bbccd08,cb6642955d..c967541307
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Do\snot\sraise\san\serror\sif\san\sunknown\sSQL\sfunction\sis\sfound\sin\sa\sCHECK\nconstraint\swhile\sparsing\sthe\sschema\sof\san\sexisting\sdatabase.
 -D 2013-01-08T12:48:10.683
 +C Merge\supdates\sfrom\strunk.
- D 2013-01-07T17:31:34.512
++D 2013-01-08T17:24:25.899
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1031,7 -1031,7 +1031,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P e65db42c9fdc1d6f257c8db54a46ee4fc0d7aaf0 0a1207c895d9f77586a3a2a4965175909be90503
- R c592e8281674aabcb292e26e43bc11c5
 -P 7695b88fe0d73fd0a36fb7d8f95350b80615a89e
 -R d208b87926befaabc0152564810a2c30
 -U drh
 -Z 406b832608500677fb00b4e113908c12
++P bf90f1fbf84a288e787a563a3952d30622b26ef9 cda790280a52d65f98a45bacb9123367b159ac7c
++R a6b6f92637c383655137b0d4f23b139b
 +U mistachkin
- Z dea10d8d285ccfffa210d46cd087e767
++Z 48d114bd69c2bfe832a8e5ad8685199a
diff --cc manifest.uuid
index 72c193b730,588a752de9..e7c701cfa8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bf90f1fbf84a288e787a563a3952d30622b26ef9
 -cda790280a52d65f98a45bacb9123367b159ac7c
++f29680c468d5635e5ea7711f12f56ff467824241