From: drh <drh@noemail.net>
Date: Fri, 2 Nov 2012 23:42:50 +0000 (+0000)
Subject: Merge the fix for ticket [bfbf38e5e9956ac6] into trunk.
X-Git-Tag: version-3.7.15~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b229f1983dab4c0029a6888005f39fed3fcd972;p=thirdparty%2Fsqlite.git

Merge the fix for ticket [bfbf38e5e9956ac6] into trunk.

FossilOrigin-Name: 4f7dfc32aad1c552d09dc8fefb40cc3656d74883
---

8b229f1983dab4c0029a6888005f39fed3fcd972
diff --cc manifest
index 1cfc75f489,dd1f5d296c..10c1286dce
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\san\sout-of-date\scomment.\s\sNo\schanges\sto\scode.
- D 2012-11-02T18:24:57.937
 -C Adding\stest\scases\sfor\sticket\s[bfbf38e5e9956a]
 -D 2012-11-02T19:08:31.592
++C Merge\sthe\sfix\sfor\sticket\s[bfbf38e5e9956ac6]\sinto\strunk.
++D 2012-11-02T23:42:50.017
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1021,7 -1021,7 +1021,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 9dca18f5fea84afbecb314ee1cdfb98430656af3
- R 3ba2075c2bb54e4c430b6beca83153a6
 -P 18ae030dad30303129186738c27cdc4ba06362b9
++P 10cc12b16b2f1ae4e6b3a84cef5a44564d282e9c 62ebfa747635a5593759ea2a28166d054c8eee8a
+ R 0bddd84c58415ef799271c8a76e36e44
  U drh
- Z 23b76a34e07f1ecdfd7e7199b52cce1c
 -Z d5af1bf3eac39af6d9724e55a6d42186
++Z ea837b25a77a7de14b46a8e2c78a888e
diff --cc manifest.uuid
index fb84c6aab1,38c8e220ab..25135eb2e8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 10cc12b16b2f1ae4e6b3a84cef5a44564d282e9c
 -62ebfa747635a5593759ea2a28166d054c8eee8a
++4f7dfc32aad1c552d09dc8fefb40cc3656d74883