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: 1bb15fc 8b0ba7b)

author	drh <drh@noemail.net>
	Wed, 16 Dec 2015 19:47:54 +0000 (19:47 +0000)
committer	drh <drh@noemail.net>
	Wed, 16 Dec 2015 19:47:54 +0000 (19:47 +0000)
commit	173b60999eb7b2fda450df311e286539fcd2b854
tree	99394b8da82d308db53045bb13d2dc8cb1623553	tree \| snapshot
parent	1bb15fc973f5b1b472897095f629abcc663bd453	commit \| diff
parent	8b0ba7b0b86a3c629e2c1f5c978e1829c7f3a59f	commit \| diff

Merge recent enhancements from trunk.

FossilOrigin-Name: f6c9273cab877b8b6b327250195f3392393d060a

Makefile.in	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/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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