From: drh Date: Wed, 10 Jul 2019 18:30:00 +0000 (+0000) Subject: Merge the 3.29.0 release into the wal2 branch. X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e31602c62de7d2ee7e58f016c40333a12f3d5a8f;p=thirdparty%2Fsqlite.git Merge the 3.29.0 release into the wal2 branch. FossilOrigin-Name: 8baa402282a231d42f419ac220a32b532766e52180e4a70da874d383d8703121 --- e31602c62de7d2ee7e58f016c40333a12f3d5a8f diff --cc manifest index a3bd7bf870,fcf4a4f733..a5df493560 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\sall\senhancements\sfrom\strunk\sinto\sthe\swal2\sbranch. - D 2019-07-08T21:19:34.627 -C Version\s3.29.0 -D 2019-07-10T17:32:03.802 ++C Merge\sthe\s3.29.0\srelease\sinto\sthe\swal2\sbranch. ++D 2019-07-10T18:30:00.047 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -1843,7 -1831,10 +1843,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 23ec34e4f61775198a2b6f8b683fa7db2c57efb1add32c12d5051558952c394c 36295dcebcb5487f2a462eabb41900ac28b8e839898ef0fae0aa4730bf9b0671 - R a857c0f6994f0dd65eb06deab6182770 -P 6f328c35947d6b3a0741514757b8944692203e89bdb2e7f9bbce8ad9288be344 -R 3dc95c8af87e7b557da20a5426ebc03a -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.29.0 * ++P dcbcbc2a6905588a63b9c926473a7097ca0a03803c5bd3f416f268ae2aa3dc87 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6 ++R 6332663817f683e4c08cd247220ba3ef U drh - Z 058b3503d1fd12a379722bdb410d3732 -Z 4d356946c4c6edd871b6d6986b095a05 ++Z 72e720935156ad62882de5c4182bc62f diff --cc manifest.uuid index 4124926a51,0a078bf4da..ad6dd73dfc --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - dcbcbc2a6905588a63b9c926473a7097ca0a03803c5bd3f416f268ae2aa3dc87 -fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6 ++8baa402282a231d42f419ac220a32b532766e52180e4a70da874d383d8703121