From: drh <>
Date: Tue, 13 May 2025 19:06:11 +0000 (+0000)
Subject: Fix trunk fork.
X-Git-Tag: major-release~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c02ac7b9d7e5ac6a9b60fb80fec1f713c985d42b;p=thirdparty%2Fsqlite.git

Fix trunk fork.

FossilOrigin-Name: 53644c42c5ee40e905a72bb014515e5e30265577d543eeca09139800822b5b42
---

c02ac7b9d7e5ac6a9b60fb80fec1f713c985d42b
diff --cc manifest
index 5db3f7b742,91fd2a7efd..5ad02672bd
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Adjust\sthe\sstrftime()\stest\sin\stest/date4.test\sto\sremove\sflags\snot\ssupported\sin\smusl\slibc\sif\sthat\senvironment\sis\sdetected.
- D 2025-05-13T18:58:56.386
 -C First\scut\sat\senhancing\sthe\sfsdir\svirtual\stable\sso\sthat\sit\sworks\swith\nunicode\scharacters\son\sWindows.
 -D 2025-05-13T16:58:36.884
++C Fix\strunk\sfork.
++D 2025-05-13T19:06:11.380
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2207,8 -2207,8 +2207,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b96cfff52b4f364388f168198e999ae2407c4afbc7b020f8bb350ab103ffb55c
- R 85fec2c5ec6747ddb0f53086fb9993a9
- U stephan
- Z 3cfcb1d09cc83362d8527d22d2870aea
 -P f9a216e3ad1b3bc9be350aad5ef3dc8b3534d3ee67d160bfedda81a61295320c
 -R 0172fac07ac39e635656e41c69267475
++P fc254c1eb784c79a371bf961945a18a680982cdcd3fdcd7e6bb481712fe21cf8 c9e04dadfdf6c860631ce5603693add565ff2033aa25af5736302af7045fc91e
++R 2c951b894630034ec93ff56350c9beb9
+ U drh
 -Z a9ac0628984f4dd39e26358da2707d12
++Z 97e0cef690bfe86eb3019d1e3b04006a
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0b28650612,94d9dbf695..27abd2b137
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc254c1eb784c79a371bf961945a18a680982cdcd3fdcd7e6bb481712fe21cf8
 -c9e04dadfdf6c860631ce5603693add565ff2033aa25af5736302af7045fc91e
++53644c42c5ee40e905a72bb014515e5e30265577d543eeca09139800822b5b42