/ Check-in [c1d96fb6]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5 into the amalgamation from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sessions
Files: files | file ages | folders
SHA1: c1d96fb654b2c0f66d586aa39d80ea0468186690
User & Date: drh 2015-10-09 15:29:24
Context
2015-10-10
20:35
Pull in the latest 3.9.0 tweaks from trunk. check-in: ed174ccf user: drh tags: sessions
2015-10-09
15:29
Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5 into the amalgamation from trunk. check-in: c1d96fb6 user: drh tags: sessions
14:37
Add --enable-fts5 and --enable-json1 options to the amalgamation autoconf package. check-in: 8a4e1988 user: dan tags: trunk
2015-10-08
14:55
Merge the 3.8.12 beta changes from trunk. check-in: 35b1b8d4 user: drh tags: sessions
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to VERSION.

Changes to autoconf/Makefile.am.

Changes to autoconf/configure.ac.

Changes to configure.

Changes to configure.ac.

Changes to ext/fts5/fts5_aux.c.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_main.c.

Changes to ext/fts5/fts5_tcl.c.

Changes to ext/fts5/fts5parse.y.

Changes to ext/fts5/test/fts5_common.tcl.

Changes to ext/fts5/test/fts5fault6.test.

Changes to ext/fts5/tool/mkfts5c.tcl.

Changes to ext/misc/json1.c.

Changes to ext/rbu/sqlite3rbu.c.

Changes to main.mk.

Changes to src/ctime.c.

Changes to src/main.c.

Changes to src/shell.c.

Changes to src/test1.c.

Changes to src/test_config.c.

Changes to test/json101.test.

Changes to test/json102.test.

Changes to test/releasetest.tcl.

Changes to tool/mksqlite3c.tcl.

Changes to tool/mksqlite3h.tcl.