From: drh <drh@noemail.net>
Date: Fri, 30 Oct 2015 16:37:44 +0000 (+0000)
Subject: Merge the 3.10.0 version number update from trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b021eb64939b76782d16e6de3b1793f33e0d3f;p=thirdparty%2Fsqlite.git

Merge the 3.10.0 version number update from trunk.

FossilOrigin-Name: 980d6207431abf8549bf8dd82d65d707872a2a31
---

51b021eb64939b76782d16e6de3b1793f33e0d3f
diff --cc manifest
index c2a5cdad93,f83dc922cc..35348db06a
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\slatest\strunk\schanges,\sincluding\ssqlite3_db_cacheflush(),\swith\sthis\sbranch.
- D 2015-10-30T16:23:03.670
 -C Increase\sthe\sversion\snumber\sto\s3.10.0,\sdue\sto\sthe\saddition\sof\sthe\nsqlite3_db_cacheflush()\sinterface.
 -D 2015-10-30T16:36:42.626
 -F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
++C Merge\sthe\s3.10.0\sversion\snumber\supdate\sfrom\strunk.
++D 2015-10-30T16:37:44.655
 +F Makefile.in 3f4e9157bfb231338d7625610806599e4beb31b7
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -1402,7 -1397,7 +1402,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P bc195e1cd9dc1c7b97bd05cd7d0664fbc599a890 ad80d3073388c59f67171720efc6ef766e19886f
- R 26c1e36523a78c4e842623bbe1fde99e
- U dan
- Z 0aaa53f0923e9fdda33db802a2f0bf34
 -P ad80d3073388c59f67171720efc6ef766e19886f
 -R 05540c814207efb67f7c8e8b3a47d3f0
++P 6e4306efaf5c0d34a1aead8ad1fe5aa836b61ca1 7565b046ff939e8310631397a4526fbd98b99aaf
++R c80645a3ee52a862fddca56bcf9c8084
+ U drh
 -Z 14542ee53e71e033be97bac3859f7dcc
++Z 1e7700dd2866b342be95806c5138e481
diff --cc manifest.uuid
index cc9e9835ed,3e10f9d11a..db5b232559
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6e4306efaf5c0d34a1aead8ad1fe5aa836b61ca1
 -7565b046ff939e8310631397a4526fbd98b99aaf
++980d6207431abf8549bf8dd82d65d707872a2a31