Merge changes from trunk.
commit31080c59178be3adbc50c166574eb69b8d126bcd
authorD. Richard Hipp <drh@hwaci.com>
Wed, 24 Jan 2018 15:02:53 +0000 (24 15:02 +0000)
committerD. Richard Hipp <drh@hwaci.com>
Wed, 24 Jan 2018 15:02:53 +0000 (24 15:02 +0000)
tree42928ceafe59796df90c7831bfab2b8bae7ca747
parentce576781cbc88e7aba6bfc6dfc6a024688280e73
parent12d148363a3c3d02538b9e7cb83910b5f51c9e5b
Merge changes from trunk.
Makefile.in
Makefile.msc
main.mk
src/main.c
src/pager.c
src/sqlite.h.in
src/sqliteInt.h
src/tclsqlite.c