From: stephan <stephan@noemail.net>
Date: Sat, 28 Sep 2024 00:37:23 +0000 (+0000)
Subject: Merge trunk into autosetup branch for latest wasm pieces.
X-Git-Tag: major-relase~351^2~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0be8482f96ee1a8c3bdae4823fc30ee3fe7207c8;p=thirdparty%2Fsqlite.git

Merge trunk into autosetup branch for latest wasm pieces.

FossilOrigin-Name: c3877d1241f946b470a7a4868f13e1106e8aac4851d4bc5a64c90e0569444b81
---

0be8482f96ee1a8c3bdae4823fc30ee3fe7207c8
diff --cc manifest
index 5fdef80811,ff89df3542..df35a34bbf
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\sinto\sthe\sautosetup\sbranch.
- D 2024-09-27T16:43:47.997
 -C Merge\swasm-build-rework\sbranch\sinto\strunk.\sSummary:\s1)\sadd\soptional\sbare-bones\sbuild,\sstripped\sof\smany\soptional\slibrary\sfeatures,\s2)\sreplace\smuch\sof\sthe\shyper-spaghetti\swasm-specific\smakefile\scode\swith\sa\smore\slegible\sstatic\scode\sgenerator.
 -D 2024-09-28T00:02:52.169
++C Merge\strunk\sinto\sautosetup\sbranch\sfor\slatest\swasm\spieces.
++D 2024-09-28T00:37:23.852
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2235,8 -2213,9 +2233,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 2ba7ab562580667bc9249f2d1f2402c605553d5583eec497398abe6d196c83d4 e74fce93c518296bdb0a4273cd5fd3f785d37d27750ca456b61a3502135775f9
- R 3c6bafdb85fa1f8ab78b8ac701bcd805
 -P e74fce93c518296bdb0a4273cd5fd3f785d37d27750ca456b61a3502135775f9 f904b3b7842da036c3e8423bae02cdf207573c92dc379a601eae289eb3c5f547
 -R 00aae997005fe8baf8a0564b28d0f4b3
 -T +closed f904b3b7842da036c3e8423bae02cdf207573c92dc379a601eae289eb3c5f547 Closed\sby\sintegrate-merge.
++P 9586ea204c705430d63e3757f80009a152b89573a75c6862e407062be8ef346c 208c27714646c9bc26eef11266086a71da04bc24e87078de0955e7beb68a821e
++R 1ef986af17c4e886df6e4f496b132523
  U stephan
- Z 88ba7ef11f9b2b829b9801a6f6a0aad2
 -Z 285fd3333f337a65629db5a9e7f33975
++Z f102d1cc9aacb9d174c9700a0adefb05
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a86e69ad50,424b2a3a6c..eb97aee2c0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9586ea204c705430d63e3757f80009a152b89573a75c6862e407062be8ef346c
 -208c27714646c9bc26eef11266086a71da04bc24e87078de0955e7beb68a821e
++c3877d1241f946b470a7a4868f13e1106e8aac4851d4bc5a64c90e0569444b81