From: dan <dan@noemail.net>
Date: Fri, 11 Jan 2019 14:59:24 +0000 (+0000)
Subject: Merge latest wal2 changes (documentation only) into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4853110e61a519f6ec0b5fd85f95855ad3a38418;p=thirdparty%2Fsqlite.git

Merge latest wal2 changes (documentation only) into this branch.

FossilOrigin-Name: 820ba1cc7e374409f27d0f1e62ed17c9670ce0e1f6e1d39a02fa8d48319745e8
---

4853110e61a519f6ec0b5fd85f95855ad3a38418
diff --cc manifest
index 905acc096a,6af6923c47..089e74eaed
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Reinstate\sassert()\sstatements\sin\sos_unix.c\sthat\swere\sremoved\sto\sallow\nwal-mode\sSHARED\slocks\sto\sbe\staken\sover\smore\sthan\sone\slocking\sslot\n(this\sbranch\sno\slonger\sdoes\sthat,\sso\sthe\sassert()\sstatements\scan\sgo\nback\sin).
- D 2019-01-02T17:08:06.138
 -C Add\snew\sfile\sdoc/wal2.md\sto\sthis\sbranch.
 -D 2019-01-11T14:58:03.764
++C Merge\slatest\swal2\schanges\s(documentation\sonly)\sinto\sthis\sbranch.
++D 2019-01-11T14:59:24.732
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@@ -1823,7 -1807,7 +1824,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 c31eeb3c87f260fa192638b3610a4d3b84b2c26cfaefc97ed63910495403f8c9 8445fb6d5dae98a0129514a10a15f08412bac5a1d8114b12e592c744ea2bc4c9
- R 0806996acba6e0b3331e631071ee176c
 -P 8445fb6d5dae98a0129514a10a15f08412bac5a1d8114b12e592c744ea2bc4c9
 -R 4b991801ac5f384be1f414fb71a05937
++P fcb7348ba190e48112a681f704313a733f7a377456e7c1d6845ba34c270d86b6 b495dce153f7f886f3dba09593f29ce2375718bf6508f2cfffd1af8071a995ae
++R 8fe5885e38031bc1cc352b2d1554601c
  U dan
- Z 44e579b069341a68865674e64e97136d
 -Z 736399187a1b654bff250254a2a37532
++Z bc841668ca707a383d27e01ba9dc3dbc
diff --cc manifest.uuid
index b187037ed0,1695a54411..59e7fffac5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fcb7348ba190e48112a681f704313a733f7a377456e7c1d6845ba34c270d86b6
 -b495dce153f7f886f3dba09593f29ce2375718bf6508f2cfffd1af8071a995ae
++820ba1cc7e374409f27d0f1e62ed17c9670ce0e1f6e1d39a02fa8d48319745e8