From: dan <dan@noemail.net>
Date: Tue, 26 Apr 2016 16:03:58 +0000 (+0000)
Subject: Merge the checksymbols fix from trunk into this branch.
X-Git-Tag: version-3.13.0~53^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a5ced4c1ebd2271694dc2d235b775167f03c98b;p=thirdparty%2Fsqlite.git

Merge the checksymbols fix from trunk into this branch.

FossilOrigin-Name: 04911cee0cd5467ee99744b774d692219e5e1425
---

0a5ced4c1ebd2271694dc2d235b775167f03c98b
diff --cc manifest
index 07bba5bb6a,01396063e2..3224381eed
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Add\san\ssqlite3FaultSim()\sall\sto\smake\sit\seasier\sto\ssimulate\sIO\serrors\sin\na\sVACUUM\scommit.
- D 2016-04-25T22:39:42.651
- F Makefile.in a905f3180accdafbd5a534bf26126ee5306d5056
 -C Fix\sthe\s"checksymbols"\starget\sin\sMakefile.in\sto\sbe\sable\sto\sdeal\swith\sthe\nsqlite3changegroup\sfamily\sof\sinterfaces.
 -D 2016-04-26T13:13:53.622
++C Merge\sthe\schecksymbols\sfix\sfrom\strunk\sinto\sthis\sbranch.
++D 2016-04-26T16:03:58.388
+ F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -1486,7 -1484,7 +1486,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 36f97ca8874a03ac8699f44fe0da95b0be507cc7
- R 54e681c99d31e5095466803c5f1b64d8
 -P 7dd48c10790a7b9c4165214399c261a0aa701297
 -R 5836a38779892d93c5f443eeb9cd4151
--U drh
- Z 6d6cde3ceb3c27e62273721031ebad91
 -Z a0cff4b059a2c6bf807105b3b6e856e6
++P 8bfde416c51f4e087275aebf652a73985515e810 d819bfbd46dc7f065d2a3ab0ef9f8322d8394e11
++R 0f2ec21167579c0f8c46594d0d9ecc27
++U dan
++Z 444c73c0b2d802c9a660647c7b166bf1
diff --cc manifest.uuid
index bbdd0e7139,cff4e97ad7..6798dc8b47
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8bfde416c51f4e087275aebf652a73985515e810
 -d819bfbd46dc7f065d2a3ab0ef9f8322d8394e11
++04911cee0cd5467ee99744b774d692219e5e1425