From: drh <drh@noemail.net>
Date: Wed, 9 May 2018 14:33:54 +0000 (+0000)
Subject: Merge trunk changes, and especially the newly published sqlite3_str interface.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3edbdc148030916ab2d4dbf7be8563ad8a96158e;p=thirdparty%2Fsqlite.git

Merge trunk changes, and especially the newly published sqlite3_str interface.

FossilOrigin-Name: f3609aefe877544c93c556840fe9a129f0680681eea0c64c084b20217dd2191e
---

3edbdc148030916ab2d4dbf7be8563ad8a96158e
diff --cc manifest
index 7e9e65234c,c74fed0775..730df958af
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experiments\swith\sroutines\sfor\sprocessing\sGeoJSON.
- D 2018-05-08T22:47:54.869
 -C Fix\sminor\sproblems\swith\sthe\ssqlite3_str\sinterface.
 -D 2018-05-09T14:29:40.085
++C Merge\strunk\schanges,\sand\sespecially\sthe\snewly\spublished\ssqlite3_str\sinterface.
++D 2018-05-09T14:33:54.780
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1729,10 -1728,7 +1729,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 d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0
- R 4e2c4ceb3f2c4ac9a19d6a92f0093d61
- T *branch * geojson
- T *sym-geojson *
- T -sym-trunk *
 -P 87f261f0cb800b06ad786f6df16f2c4dddd0d93dfdcc77b4a4eaa22920b56bf1
 -R 49d1b2d51ef077394ee5b5fe7c9141e7
++P d22fbff2a3dcda4bd5febd36325e4d543b8756eb9c96891ff0c610e16a52ef52 43ea8a6836ccb9910314d35e07d881694200c97ef5969629f62e49f7a2a42f92
++R 5dd3738e573a1c6c8ecc6bb4a25bb591
  U drh
- Z 99183057ba60fbcf886032462d182865
 -Z 4cea265c4571f106ecaa372877866c59
++Z 9f375a6b8f3ff34711642d3316f97a85
diff --cc manifest.uuid
index f2246d00ec,ed2a319f3a..591844c51b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d22fbff2a3dcda4bd5febd36325e4d543b8756eb9c96891ff0c610e16a52ef52
 -43ea8a6836ccb9910314d35e07d881694200c97ef5969629f62e49f7a2a42f92
++f3609aefe877544c93c556840fe9a129f0680681eea0c64c084b20217dd2191e