From: stephan Date: Sat, 12 Aug 2023 21:39:18 +0000 (+0000) Subject: Merge the Java Native Interface (JNI) binding into trunk. X-Git-Tag: version-3.43.0~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=202651fe86b4da17b6d6c2c60a5bc5afd1c81e6c;p=thirdparty%2Fsqlite.git Merge the Java Native Interface (JNI) binding into trunk. FossilOrigin-Name: 48b13edcec6935bf125b265b41a3e6f7b2407afff89d5b4daa2939e3c5679ca0 --- 202651fe86b4da17b6d6c2c60a5bc5afd1c81e6c diff --cc manifest index 267fd91960,5886fc5e4c..f112606117 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Update\swasm's\spush-testing\srule\sto\sexclude\sfiles\swhich\swere\srecently\sremoved\sfrom\sthe\sbuild. - D 2023-08-12T21:08:41.355 -C Correct\sJNI\s.jar\srules\sto\sonly\sinclude\s*.java/class\sfiles,\snot\s*.*\s(*~\sfiles). -D 2023-08-12T20:50:29.873 ++C Merge\sthe\sJava\sNative\sInterface\s(JNI)\sbinding\sinto\strunk. ++D 2023-08-12T21:39:18.053 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -2051,8 -2091,8 +2091,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 01f49448cd0cfe3af499aedfe887b7b0be4f1ab09cd5a16119ddafb32b107708 - R 2ecaec09aa6a0d3ef6dc669f83d54223 -P 290028d3ca5638f3bb18a0b243c7ba3c31c8a2b1a837c36ec29e0fc4ed6533f0 -R adb17bd749dd5a1323c629b30f4e78d5 ++P 0a6930a7ff8f8c6ca244d1d654532f3d2a02d77ef67c6cae0c53092743d59ea6 1ba7754045a009d9c94b23ac76b9bb8d9c9cb24d42dcdf1203ee75ac85765d3e ++R 71919983f1228c04d42d3555e47fba1b ++T +closed 1ba7754045a009d9c94b23ac76b9bb8d9c9cb24d42dcdf1203ee75ac85765d3e Closed\sby\sintegrate-merge. U stephan - Z 90975d5312aef561538895b18087fc5f -Z 783b680c88e3a138aa5797daa96c621c ++Z 06dd3519c67c3e383d12eeb6b6fbb0d1 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 3606b738a2,a89e4b4b29..1c747eb83a --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 0a6930a7ff8f8c6ca244d1d654532f3d2a02d77ef67c6cae0c53092743d59ea6 -1ba7754045a009d9c94b23ac76b9bb8d9c9cb24d42dcdf1203ee75ac85765d3e ++48b13edcec6935bf125b265b41a3e6f7b2407afff89d5b4daa2939e3c5679ca0