From: drh Date: Tue, 17 Mar 2020 12:37:27 +0000 (+0000) Subject: Merge changes from trunk. X-Git-Tag: version-3.32.0~49^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d8c287309d5d7a50c134630d504c2d8886cc783;p=thirdparty%2Fsqlite.git Merge changes from trunk. FossilOrigin-Name: 93d710262eb046e2370660b1096ac634373755f92a2e9b1220df3b2bda5f9eeb --- 9d8c287309d5d7a50c134630d504c2d8886cc783 diff --cc manifest index fd1594c439,33968d93ce..994c385818 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\senhancements\sfrom\strunk. - D 2020-03-11T20:03:22.100 -C Fix\shandling\sof\swindow\sfunctions\sin\saggregate\squeries\sthat\shave\sno\sGROUP\sBY\sclause.\sAlso\sremove\sa\sfaulty\sassert\scausing\sthe\serror\sreported\sin\s[618156e3]. -D 2020-03-16T18:52:53.584 ++C Merge\schanges\sfrom\strunk. ++D 2020-03-17T12:37:27.533 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -1860,7 -1860,7 +1860,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 e05f743f619a6b60d0782ee85c73f6866696962954d7cb3eceb03af79c6a6189 c5f96a085db9688a09793f52ce1ecf033c2e6e2e5873a19fe0fb374b242b317f - R 31456ba351a9908f0290d907623e53a3 -P 8b437b47266ec2d80d85eafcfdd6949556d6c28d9d67d5f43d89799f0f5b7bd0 -R 83896a738442d3613c6ebca4ec841bd3 -U dan -Z 2f006c28af39fb0df1c35af9d6bf5ad5 ++P 4945a66237fa3861bc691d5fbef0d40286b596a0902b4f4c032d1d6528bb1a1b 38e3dd389d142e520c71139ec84aa3c7722992af28a5f93a7f16e0ea176b74bb ++R eadca1c0864a77f7553dbd5cd11ef9e9 +U drh - Z e9b8258d5115889cfb737fd42109ec8d ++Z b90799a92dde3b33fc19c32a21522ba6 diff --cc manifest.uuid index 6c03a0eb93,8afdae801f..fe5bcb97ea --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 4945a66237fa3861bc691d5fbef0d40286b596a0902b4f4c032d1d6528bb1a1b -38e3dd389d142e520c71139ec84aa3c7722992af28a5f93a7f16e0ea176b74bb ++93d710262eb046e2370660b1096ac634373755f92a2e9b1220df3b2bda5f9eeb