From: mistachkin <mistachkin@noemail.net>
Date: Mon, 20 Apr 2015 23:53:50 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fvsix2015;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 583a79a04ac6f85766209918d1ee58d394d62454
---

82d9c34424dd12185fc4bae4483b9675bc1e54b2
diff --cc manifest
index 911f609b4e,68707be4d4..df2053f796
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sanother\sharmless\scompiler\swarning.
- D 2015-04-19T23:48:10.023
 -C Add\sthe\s--mode\soption\sto\sfuzzershell.
 -D 2015-04-20T22:36:49.631
++C Merge\supdates\sfrom\strunk.
++D 2015-04-20T23:53:50.803
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1251,7 -1251,7 +1251,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 59d1a3bb6050a812c4eb0d25ac53327081b9efed
- R c62ac4459285512471f07359006f6839
 -P 41c954391690833bf2ece4ea14457ee4bdd74e90
 -R 18124f1b8c247e9f547c30e618d3a441
 -U drh
 -Z d312afa4cd0d932d0a233db0b53736ad
++P 5ae853aaebaee76c9265061984185f74c10c4c8b b940b0fa6cf68fef58344d269ad5d39468ffe72f
++R 9804529a8e22c5281a0b002dbd15342c
 +U mistachkin
- Z 8e5b7cac312056ae4f94ac4a6cc605a8
++Z 86189532b6fc39f0925b12aaa4387878
diff --cc manifest.uuid
index f36e0dbd24,dfe61ad96a..71cc58d18e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5ae853aaebaee76c9265061984185f74c10c4c8b
 -b940b0fa6cf68fef58344d269ad5d39468ffe72f
++583a79a04ac6f85766209918d1ee58d394d62454