Merge remote-tracking branch 'origin/sqlite-release' into prerelease-integration
commit1dd36b83842a2db5ef535833dae66c8758143cb9
authorNick Parker <nparker@zetetic.net>
Fri, 2 Dec 2016 22:50:50 +0000 (2 16:50 -0600)
committerNick Parker <nparker@zetetic.net>
Mon, 5 Dec 2016 20:09:57 +0000 (5 14:09 -0600)
tree81b3118eba86fe76ec089bfd531572232fe410bc
parent5958df7f255707c583795f2ddf3bd7a9103166fa
parent9644b9fe8599a9b5eef9e1e4ab8d5b12cb90280b
Merge remote-tracking branch 'origin/sqlite-release' into prerelease-integration
Makefile.in
Makefile.msc
configure
configure.ac
src/func.c
src/pager.c
src/pragma.c
src/shell.c
tool/mksqlite3c.tcl