]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge trunk
authorjan.nijtmans <jan.nijtmans@noemail.net>
Fri, 28 Mar 2025 07:09:56 +0000 (07:09 +0000)
committerjan.nijtmans <jan.nijtmans@noemail.net>
Fri, 28 Mar 2025 07:09:56 +0000 (07:09 +0000)
FossilOrigin-Name: 6a449918c20e9ec001877de34a8f593a5039c0b0a04ee13adab76934a2afcc39

1  2 
manifest
manifest.uuid

diff --cc manifest
index 837497bcdfcdddaf1835ccf6c4efeb91b9d08794,f1922909d902abfa6793f51c2867b9aad44381b7..7e2ec3c8c925ff3f471f045a855cbc3b6065d69b
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\san\sexplicit\sdb\sclose\sto\sfix\sa\sfile-is-opened\sfailure\sin\ssession1.test\sin\scygwin.
- D 2025-03-27T18:42:51.747
 -C Merge\scygwin\sand\stclsqlite\sfixes\sinto\strunk.
 -D 2025-03-27T23:29:25.564
++C Merge\strunk
++D 2025-03-28T07:09:56.542
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2216,8 -2216,8 +2216,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 99fdd19193056259d84768f46519328c300976b102f1b1e0b815720df01b28d0
- R 0e7cf04d0b98fc57a6a54399d55f0abd
- U stephan
- Z 8501b14f4f0f61714b2ced1b79f0fe62
 -P c5206cee83a4f1e59bfceda35cdfa528f9b4611eaf306da863ae83e9f93cdeb7 c6e4e1cf2b70d2e603ea3faabd9cb5fbd9f5497672574283ace8c62984dfbb97 e60198001e12f85a5d6504ce72226dfceb8666fe5ec649237fa23ae20e8aa32d
++P c6e4e1cf2b70d2e603ea3faabd9cb5fbd9f5497672574283ace8c62984dfbb97 121f4d97f9a855131859d342bc2ade5f8c34ba7732029ae156d02cec7cb6dd85
+ R d6dc8c3c7bf9724429b6bef84640ccd0
 -U drh
 -Z 9fba388b00eb19a7b9fc8b81e9cc02c7
++U jan.nijtmans
++Z 38dfb15f7bbfaab098008f6182374596
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 44ff91e1efb0d7e6687d380cd740723f016dc9ad,583806bacb44f6be28393cafdfa1b300e39be49f..9335035b94774c6ae6e6b123c8f011dfde0251dd
@@@ -1,1 -1,1 +1,1 @@@
- c6e4e1cf2b70d2e603ea3faabd9cb5fbd9f5497672574283ace8c62984dfbb97
 -121f4d97f9a855131859d342bc2ade5f8c34ba7732029ae156d02cec7cb6dd85
++6a449918c20e9ec001877de34a8f593a5039c0b0a04ee13adab76934a2afcc39