From: stephan <stephan@noemail.net>
Date: Thu, 27 Jul 2023 20:12:48 +0000 (+0000)
Subject: Merge trunk into jni branch for compiler warning fixes.
X-Git-Tag: version-3.43.0~47^2~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eead0ffef86b30646713525121a18a600f376aef;p=thirdparty%2Fsqlite.git

Merge trunk into jni branch for compiler warning fixes.

FossilOrigin-Name: 0514fd340ae15a95760d50c747d6fb9eae5109cb5045eeabc2bc199be0a5ae35
---

eead0ffef86b30646713525121a18a600f376aef
diff --cc manifest
index 21efb214a7,a1ea1f26ec..28272160aa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Initial\scheck-in\sof\sJNI\s(Java\sNative\sInterface)\sbindings\sfor\sthe\score\sC\sAPI.
- D 2023-07-27T20:02:49.521
 -C Fix\sa\scouple\sof\scompiler\swarnings\sin\sfts5_index.c.
 -D 2023-07-27T20:08:44.624
++C Merge\strunk\sinto\sjni\sbranch\sfor\scompiler\swarning\sfixes.
++D 2023-07-27T20:12:48.495
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2066,11 -2049,8 +2066,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P d66b182d2bc6ce0772e69401b7affe1adbc1b128c4631cb3c17f98dde72af00a
- R 9595d1bd6387113a14191c3a678b4869
- T *branch * jni
- T *sym-jni *
- T -sym-trunk * Cancelled\sby\sbranch.
 -R 67e5566856c21efabeaa9f30d61da2e8
 -U dan
 -Z 82b2d14bd5c4ac2218712be1054b30ff
++P b5374b9ef58fa0be80aefccde0721f5599fb820464b13940b6361b9aa09a59d5 bf71faa2a1d29ea762c4d2485522d6f4f8a5a7166981a92d3ba9c96ccbbe1213
++R 7dd86993b43278424be52f48d5e5f4e4
 +U stephan
- Z 1ff9901b09f119a40a482027609a6cc2
++Z 1238bb2bb995ce156bfcc94eb1fcf862
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8421cad165,c1365ea15a..2724037502
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5374b9ef58fa0be80aefccde0721f5599fb820464b13940b6361b9aa09a59d5
 -bf71faa2a1d29ea762c4d2485522d6f4f8a5a7166981a92d3ba9c96ccbbe1213
++0514fd340ae15a95760d50c747d6fb9eae5109cb5045eeabc2bc199be0a5ae35