Merge all recent enhancements from trunk.
commitffd35b1e75152e2099054274ac91e12034d27f9e
authorD. Richard Hipp <drh@hwaci.com>
Tue, 31 Oct 2017 18:15:36 +0000 (31 18:15 +0000)
committerD. Richard Hipp <drh@hwaci.com>
Tue, 31 Oct 2017 18:15:36 +0000 (31 18:15 +0000)
treee180a4b900d8fd9b976837c902469a06ed1a9530
parent2963bb1fa205a22c8b727b66310cb14c738af78d
parentbba3f6296327c2eb433161c485bfc944dd80ba8f
Merge all recent enhancements from trunk.
Makefile.in
Makefile.msc
main.mk