From: drh <drh@noemail.net>
Date: Fri, 18 Apr 2014 01:14:46 +0000 (+0000)
Subject: Merge the latest changes from sessions.
X-Git-Tag: version-3.13.0~148^2~145^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e49b2718e0e5f32be0497e0a3e1630589c0fb957;p=thirdparty%2Fsqlite.git

Merge the latest changes from sessions.

FossilOrigin-Name: d9eef5b03c7c4bb69c11eda41152ee81aed1cac7
---

e49b2718e0e5f32be0497e0a3e1630589c0fb957
diff --cc manifest
index f00e6668a6,94ba8af65e..967e3767a3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Performance\soptimization\son\sbyte-swapping\sin\sR-Tree.
- D 2014-04-17T23:23:29.676
 -C Merge\srecent\strunk\schanges\sinto\ssessions.
 -D 2014-04-18T01:10:05.240
++C Merge\sthe\slatest\schanges\sfrom\ssessions.
++D 2014-04-18T01:14:46.009
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1176,7 -1175,7 +1177,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 71692aa97c78676f0ba80eaeec0ad9ac225f4427
- R f1ebd50a7930430ccdb2dd222ebc5021
 -P 9515c8344a6743bbb0c6a6e49fb79fb3139090df 2c5363873a6f990a0abaacac6303acd46b48befc
 -R 6f10c61594cf9e1d36bddcd9a9abd40d
++P 444084fd620fc3f45cfb87b83f532d76bd2744e7 95e77efe076ab421bd246119c47dba5dacf9d087
++R e9845f4b2c71a18e1d378888de7ae7a2
  U drh
- Z 8e204d3bb697cd291df3586d6cea66ab
 -Z cbe658a5d5d955eb999ebf57e51622f9
++Z 0c4fc380d884463ecab3c74420a85e5e
diff --cc manifest.uuid
index 41369a2d98,6da7ed206c..2112ab381a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 444084fd620fc3f45cfb87b83f532d76bd2744e7
 -95e77efe076ab421bd246119c47dba5dacf9d087
++d9eef5b03c7c4bb69c11eda41152ee81aed1cac7