From: drh <drh@noemail.net>
Date: Fri, 16 Jun 2017 12:15:25 +0000 (+0000)
Subject: An unintentional fork was created due to a typo when creating branch-3.18.
X-Git-Tag: version-3.18.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=004ba5404886e1ef876ead78bbd5e47e399974be;p=thirdparty%2Fsqlite.git

An unintentional fork was created due to a typo when creating branch-3.18.
This check-in resolves the fork and is the 3.18.1 release candidate.

FossilOrigin-Name: 20e5ffb1ceed514bf812ea5a2ce027b55203612bdbf8116a69f0cd52c67dbb84
---

004ba5404886e1ef876ead78bbd5e47e399974be
diff --cc manifest
index cce089469f,18d2d8b97b..f8fe4f4a85
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Increase\sthe\sversion\snumber\sto\s3.18.1.
- D 2017-06-15T07:47:09.966
 -C Ensure\spointer\smap\sentries\sare\salways\sadded\swhen\sa\srow\sthat\sdoes\suse\soverflow\npages\sreplaces\sone\sthat\sdoes\snot\sin\san\sauto-vacuum\sdatabase.\sFix\sfor\n[fda22108].
 -D 2017-06-12T23:44:37.129
++C An\sunintentional\sfork\swas\screated\sdue\sto\sa\stypo\swhen\screating\sbranch-3.18.\nThis\scheck-in\sresolves\sthe\sfork\sand\sis\sthe\s3.18.1\srelease\scandidate.
++D 2017-06-16T12:15:25.099
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@@ -1569,7 -1569,11 +1569,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 424a0d380332858ee55bdebc4af3789f74e70a2b3ba1cf29d84b9b4bcf3e2e37
- R d9d2937a9ef81a143daa8ffb08c470ae
 -Q +b30dfba811cb531b09ff2e71a1a18ed53c816cb39155dd52ca3e2701425fe17b
 -R 57dce72cc0744ff6614258be32191fb6
 -T *branch * 3.18
 -T *sym-3.18 *
 -T -sym-branch-3.18 *
++P 4be2eba8c15104e9f420738092c06a14a9c9c34b13c0c8f897302ab7613ffccc 30c50f0e06084f3c4357962ed99e2c803b21ca238d00d70d9dee40164caf2afa
++R eff70f988c3d37d60a840932b2823aa3
++T +closed 30c50f0e06084f3c4357962ed99e2c803b21ca238d00d70d9dee40164caf2afa
  U drh
- Z b647ddcdafc3db3432ec33f7a67073de
 -Z 41752df1655a19c4124bf0da1d21e965
++Z 14751ab82fc1ed40f07c1c885ed5e7be
diff --cc manifest.uuid
index d9f04f3666,286340b25a..751b5e3ad1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4be2eba8c15104e9f420738092c06a14a9c9c34b13c0c8f897302ab7613ffccc
 -30c50f0e06084f3c4357962ed99e2c803b21ca238d00d70d9dee40164caf2afa
++20e5ffb1ceed514bf812ea5a2ce027b55203612bdbf8116a69f0cd52c67dbb84