From: dan <dan@noemail.net>
Date: Fri, 23 Aug 2013 17:54:46 +0000 (+0000)
Subject: Merge recent trunk changes.
X-Git-Tag: version-3.13.0~148^2~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f0656d8c54bc48cc148bdd93b1467d633844df4;p=thirdparty%2Fsqlite.git

Merge recent trunk changes.

FossilOrigin-Name: 6cc54de88bba00e07fac9de36caac216d94bf070
---

9f0656d8c54bc48cc148bdd93b1467d633844df4
diff --cc manifest
index 11155359af,5f24bd8b5c..a468c90153
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sthe\ssqlite3session_table_filter\sAPI\sto\sthe\ssessions\sextension.
- D 2013-08-23T17:43:32.715
 -C Adjust\s#ifdefs\sto\sget\sSQLITE_OMIT_AUTOMATIC_INDEX\sand\sSQLITE_OMIT_PAGER_PRAGMAS\nto\sbuild.
 -D 2013-08-23T17:33:46.203
++C Merge\srecent\strunk\schanges.
++D 2013-08-23T17:54:46.168
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e9f41f89111627baaabd95cab4988b8d1c3e47c9
 +F Makefile.msc e5cc521bbc9fb09f032f7fef563542da7ac5544a
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@@ -1120,7 -1105,7 +1120,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 831492dca8bcfb1a1f83a8bb15de9cc94f29f07e
- R cbce615b433685cc6c1cb9210155f0f8
 -P 3ad1f998e5db044849b528c31c4a7e1f3d527320
 -R 5a6ead2576f296902c1b2ccbdf985254
 -U drh
 -Z 27173a06b09c0a2f08350ebdebfa00ec
++P b7e4dd889d37c8f57c2d3c7900e802f644aac3ea ed310201628cf79c0f57674ae7478ee6738b1c6e
++R 4028fc1f369293594c0fe8d5f10d386c
 +U dan
- Z 2d1cb3afe326cb66267c2981ea353dde
++Z 6b7f4d8151d5a58f275c430cbe09ca16
diff --cc manifest.uuid
index 023cc42f5d,a81384f06a..710b102279
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b7e4dd889d37c8f57c2d3c7900e802f644aac3ea
 -ed310201628cf79c0f57674ae7478ee6738b1c6e
++6cc54de88bba00e07fac9de36caac216d94bf070