From: dan <dan@noemail.net>
Date: Fri, 11 Jan 2019 15:26:13 +0000 (+0000)
Subject: Merge documentation changes from branch begin-concurrent-wal2 into this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d65b8528a515e4b1d8bfb622179ee290382b9f33;p=thirdparty%2Fsqlite.git

Merge documentation changes from branch begin-concurrent-wal2 into this branch.

FossilOrigin-Name: cf8a0c71cf1032bd4271cf889304def0fab82a76eac255d734652008fff6c9b6
---

d65b8528a515e4b1d8bfb622179ee290382b9f33
diff --cc manifest
index 8db53c99df,1cc42b51e6..5d18c9e047
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\sbegin-concurrent-wal2\schanges\s(documentation\sonly).
- D 2019-01-11T15:00:05.417
 -C Merge\sdocumentation\schanges\sfrom\sbranch\s"begin-concurrent"\sinto\sthis\sbranch.
 -D 2019-01-11T15:22:27.559
++C Merge\sdocumentation\schanges\sfrom\sbranch\sbegin-concurrent-wal2\sinto\sthis\sbranch.
++D 2019-01-11T15:26:13.449
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@@ -1823,7 -1825,7 +1825,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 079daedbe440e712dc944aeef831ef6531d44096da406d52ce0d85a8a49618c5
- R c8312e5786119c8d77220079d208d0ab
 -P 820ba1cc7e374409f27d0f1e62ed17c9670ce0e1f6e1d39a02fa8d48319745e8 fdbf97e611ed23f86dc0df9d53421fb04226af0d1c7171d55c11acd0dbe935f0
 -R 610cbf661872da3534d28d987e52b3ad
++P d0ab56a3be29d112c792efef8ae7ceacc43fa5773fe06bdc0e45bf9147f84bb4 41e742bd0f94894b096b30474fb548f58951756d1ea47d0afb717a54802888f4
++R 754f7adc7369f36751be495406429949
  U dan
- Z e60b02c11231906e9d39e575f9fb3030
 -Z 9e1b3f1f4c1450011db0f9cc2ebfe96b
++Z ba8af5f4e4c8fadeeb442666542b860b
diff --cc manifest.uuid
index d4ab768e5f,c8e2d6290f..bef88f8155
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d0ab56a3be29d112c792efef8ae7ceacc43fa5773fe06bdc0e45bf9147f84bb4
 -41e742bd0f94894b096b30474fb548f58951756d1ea47d0afb717a54802888f4
++cf8a0c71cf1032bd4271cf889304def0fab82a76eac255d734652008fff6c9b6