From: mistachkin <mistachkin@noemail.net>
Date: Sun, 1 Sep 2013 23:36:44 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.1~11^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c215c9fd46ed3423e39ca08a32835f926b8a172;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 2982725e12715fba425a46ae024f317f031b6a54
---

1c215c9fd46ed3423e39ca08a32835f926b8a172
diff --cc manifest
index e7f15964da,20e7aec2b2..ff7380ec5a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Handle\sBLOBs\sspecially,\streating\sthem\sas\sbinary,\sin\sthe\stointeger()\sand\storeal()\sSQL\sfunctions.
- D 2013-08-31T21:41:09.620
 -C Cleanup\sof\sthe\swindows\sVFS,\sincluding\sadded\ssupport\sfor\sCygwin,\sfixes\nfor\scompiler\swarnings\sunder\sunusual\sconfigurations,\sand\simproved\sdiagnostic\nerror\smessages.
 -D 2013-08-31T18:36:14.237
++C Merge\supdates\sfrom\strunk.
++D 2013-09-01T23:36:44.564
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1109,7 -1109,7 +1110,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P b724219b008d9851de18bd4158375100d781c5a3
- R eb3d216eeef911fedebe51f6e14ce498
 -P 1e86d81d46c9da6aaee0c6938ee40933f35e3d0d aa48284637b954d63bcf77e19b25e75c7ad1a6d3
 -R 86ece7a1f31f0a8c4eaf6a2aa2ba8fd5
 -U drh
 -Z 6d21523c19e589363df183a571e778f3
++P c4c53acb985a248c89db2d75025d941e3a4899bc c94933f13208f3f7d6d1b117ce6d2821100655a4
++R 78e6edd05b7acf1ce753e27ea742b6df
 +U mistachkin
- Z 1633034cbe064c087ca5481033ebadfd
++Z e29db6a65ca4b79187ca51ff7b874db3
diff --cc manifest.uuid
index 4503ca3dd4,6278beba1b..66df56a57e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c4c53acb985a248c89db2d75025d941e3a4899bc
 -c94933f13208f3f7d6d1b117ce6d2821100655a4
++2982725e12715fba425a46ae024f317f031b6a54