From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 14:39:54 +0000 (+0000)
Subject: Merge opfs-proxy-atomics branch into the fiddle-opfs branch.
X-Git-Tag: version-3.40.0~169^2~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fea03bc0caaadc6d44e4f6de1692f7ea1f73ab32;p=thirdparty%2Fsqlite.git

Merge opfs-proxy-atomics branch into the fiddle-opfs branch.

FossilOrigin-Name: 25a36920d44544547a84161681cd41e292b4a70df60ac3630791873a79237d98
---

fea03bc0caaadc6d44e4f6de1692f7ea1f73ab32
diff --cc manifest
index 13980df6d3,a6a7d0a7be..15ba2f0999
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C OPFS\sVFS:\sfurther\sinternal\srefactoring\stowards\sexperimenting\swith\sa\snew\scomms\smodel.
- D 2022-09-20T03:31:02.139
 -C Remove\san\sobsolete\sfile.
 -D 2022-09-20T14:21:58.678
++C Merge\sopfs-proxy-atomics\sbranch\sinto\sthe\sfiddle-opfs\sbranch.
++D 2022-09-20T14:39:54.222
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2026,8 -2025,8 +2025,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d4d63e4580ad8d497310608175308c03c517e051d7865cb66aa0b10356612d7d
- R 7fef73d3d6085edd0d87db08b80a36c1
 -P 5bf235bbe035e4ace7a54851e190742528af6b4266328a1b8bbb9fb3dd7f2118
++P 5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1 1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427
+ R 41b4a0b0d5548be3b8c342b39c8cce92
++T +closed 1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427 Closed\sby\sintegrate-merge.
  U stephan
- Z d9dc6ab88cc2471cfc1f140af8fec063
 -Z 524d6845dd279f2ce03cb802d7ae16c8
++Z 919304ebee6398ab381c09fc060e29a5
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b2152187c4,a0a90cad10..49a16c4ea6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1
 -1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427
++25a36920d44544547a84161681cd41e292b4a70df60ac3630791873a79237d98