git.ipfire.org Git - thirdparty/sqlite.git/commit

]> git.ipfire.org Git - thirdparty/sqlite.git/commit

projects / thirdparty / sqlite.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 769dc6e f7ce429)

author	drh <drh@noemail.net>
	Wed, 2 Dec 2015 20:40:26 +0000 (20:40 +0000)
committer	drh <drh@noemail.net>
	Wed, 2 Dec 2015 20:40:26 +0000 (20:40 +0000)
commit	1bb15fc973f5b1b472897095f629abcc663bd453
tree	4eda31846a69354eb5ba5ff9dc91602a18d942ac	tree
parent	769dc6e2a22b3104583ad357b01f31a22e146a5c	commit \| diff
parent	f7ce4291a94573cdb04e5f3fcf59ed9e69226479	commit \| diff

Merge recent enhancements from trunk.

FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8

16 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
Makefile.msc	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/shell.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/update.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/vdbeblob.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/sqlite/sqlite.git